[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-299-g8678928

[Michal Čihař]

The branch, master has been updated
       via  867892816d37dde8e2848c6f659f174837a1e147 (commit)
       via  809e602f894b31207f49f94e04db325df27e6848 (commit)
      from  5ed1d80bff394d913decff2caad545f69d850de0 (commit)


- Log -----------------------------------------------------------------
commit 867892816d37dde8e2848c6f659f174837a1e147
Merge: 809e602f894b31207f49f94e04db325df27e6848 5ed1d80bff394d913decff2caad545f69d850de0
Author: Pootle server <pootle at cihar.com>
Date:   Fri Jan 14 00:40:06 2011 +0100

    Merge remote branch 'origin/master'

commit 809e602f894b31207f49f94e04db325df27e6848
Merge: a1fe2f26d041d40ef55da61dffafa6570caa4ccf d9f862a8c115811062f71d818c7d98e027c4f2c4
Author: Pootle server <pootle at cihar.com>
Date:   Thu Jan 13 22:40:10 2011 +0100

    Merge remote branch 'origin/master'

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

Summary of changes:


hooks/post-receive
-- 
phpMyAdmin