Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Wed, 5 Mar 2014 19:23:23 +0000 (20:23 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Wed, 5 Mar 2014 19:23:23 +0000 (20:23 +0100)
Conflicts:
include/newsletter.inc.php


No differences found