Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9c0a4022d2df87d782e0c05ce1ac6e4ad5758598
      
https://github.com/phpmyadmin/phpmyadmin/commit/9c0a4022d2df87d782e0c05ce1ac6e4ad5758598
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix merge conflict


  Commit: 1b0037f108f3d9e38906164f8d23bbb46c947701
      
https://github.com/phpmyadmin/phpmyadmin/commit/1b0037f108f3d9e38906164f8d23bbb46c947701
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_0'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/4d8e34d95455...1b0037f108f3
------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&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