Branch: refs/heads/QA_4_2
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 72d2741f37c27a3e73aa36827fe5f8e73d351c4b
      
https://github.com/phpmyadmin/phpmyadmin/commit/72d2741f37c27a3e73aa36827fe5f8e73d351c4b
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M po/hy.po

  Log Message:
  -----------
  Adjust plurals equation

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 88cd689346757daf2e65c3344a8bf3df359b1225
      
https://github.com/phpmyadmin/phpmyadmin/commit/88cd689346757daf2e65c3344a8bf3df359b1225
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M po/hy.po

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_13' into QA_4_2


  Commit: d7b0f0d4f9e0ac78a3a83aeee7cbf91c389d275d
      
https://github.com/phpmyadmin/phpmyadmin/commit/d7b0f0d4f9e0ac78a3a83aeee7cbf91c389d275d
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M .travis.yml
    M build.xml
    M composer.json

  Log Message:
  -----------
  Install phpunit using composer

The pear channel is now disabled so our test fail.

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 053cd7303131fa09c164b0ff84bb9bd59f087118
      
https://github.com/phpmyadmin/phpmyadmin/commit/053cd7303131fa09c164b0ff84bb9bd59f087118
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M .travis.yml
    M build.xml
    M composer.json

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_13' into QA_4_2


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/4ac6b01e17c2...053cd7303131
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to