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)
commit5f317a8d97f36d3a201149039b6996586b57826d
treed2326dd37dc24c7e69baa02eb2f302d8fc8d48d1
parentf42e15fcc22e9c4bd21e881b1124061dcae3494c
parent7951d5b0c1bc1e69b7790403309061df2d4d8cc4
Merge branch 'xorg/maint'

Conflicts:
include/newsletter.inc.php
include/newsletter.inc.php