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)
1  2 
include/comletter.inc.php
templates/comletter/submit.tpl

Simple merge
Simple merge