The branch, master has been updated
via 979cc56f424baefc65ea8ebbcdf4a92118e4bc17 (commit)
via b6132c51540b24d821641d0a2c7a749bbc55d813 (commit)
via 30acade5a799a77321a9a1e2f7f97681f4e8b401 (commit)
via 48cf4d398d3b5667522ceb702827fe24061d43f0 (commit)
from 72b18cbb9d216cb850700589a184e9ea3e9fc458 (commit)
- Log -----------------------------------------------------------------
commit 979cc56f424baefc65ea8ebbcdf4a92118e4bc17
Merge: 72b18cbb9d216cb850700589a184e9ea3e9fc458 b6132c51540b24d821641d0a2c7a749bbc55d813
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Apr 15 09:21:23 2010 +0200
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 2 +-
translators.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 5e07feb..6805a48 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -5038,7 +5038,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas,
"Manuzhai".
</div>
<ul id="footer">
- <li>Copyright © 2003 - 2009 <a
href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel
team</a></li>
+ <li>Copyright © 2003 - 2010 <a
href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel
team</a></li>
<li><a href="LICENSE">License</a></li>
<li><a
href="http://www.phpmyadmin.net/home_page/donate.php">Donate&l…
<li class="last">Valid <a
href="http://validator.w3.org/check/referer">HTML</a> and <a
href="http://jigsaw.w3.org/css-validator/check/referer">CSS<…
diff --git a/translators.html b/translators.html
index b4acff5..2cf9227 100644
--- a/translators.html
+++ b/translators.html
@@ -460,7 +460,7 @@
</div>
<ul id="footer">
- <li>Copyright © 2003 - 2009 <a
href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel
team</a></li>
+ <li>Copyright © 2003 - 2010 <a
href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel
team</a></li>
<li><a href="LICENSE">License</a></li>
<li><a
href="http://www.phpmyadmin.net/home_page/donate.php">Donate&l…
<li class="last">Valid <a
href="http://validator.w3.org/check/referer">HTML</a> and <a
href="http://jigsaw.w3.org/css-validator/check/referer">CSS<…
hooks/post-receive
--
phpMyAdmin