The branch, master has been updated
       via  e27befbdcc4e27c90c64ee398315a37f4be8df73 (commit)
       via  b94febeb89b208e935b58dc80d2b07446d35d9b0 (commit)
      from  15b25f93e99539a34645244af9d020a68b30334e (commit)


- Log -----------------------------------------------------------------
commit e27befbdcc4e27c90c64ee398315a37f4be8df73
Merge: 15b25f9 b94febe
Author: Marc Delisle <[email protected]>
Date:   Fri Nov 4 13:00:31 2011 -0400

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 Documentation.html |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 0a403ce..ad67696 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4737,7 +4737,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 
 02110-1301  USA
 
 <li>Marc Delisle &lt;marc_at_infomarc.info&gt;
 <ul>
-  <li>multi-language version</li>
+  <li>multi-language version in December 1998</li>
   <li>various fixes and improvements</li>
   <li><abbr title="structured query language">SQL</abbr> analyser (most of 
it)</li>
   <li>current project maintainer</li>
@@ -4748,7 +4748,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 
 02110-1301  USA
   <li>started SourceForge phpMyAdmin project in March 2001</li>
   <li>sync'ed different existing CVS trees with new features and bugfixes</li>
   <li>multi-language improvements, dynamic language selection</li>
-  <li>current project maintainer</li>
   <li>many bugfixes and improvements</li>
 </ul></li>
 


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to