Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Mon, 3 Feb 2014 20:15:20 +0000 (21:15 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Mon, 3 Feb 2014 20:15:20 +0000 (21:15 +0100)
commit73317355964c4cd538157f8b281a1384b7e38e4d
tree803b79c63bfedde3fc67ec5ff9f83097ef601f67
parent397d19806d3139b9e3c2d2f6a122e2642e95a65d
parent37b9ab3069f91786d8094240e5d9ca7ab9a4f464
Merge branch 'xorg/maint'
include/comletter.inc.php
templates/comletter/submit.tpl