Merge commit '1b7e2f6c7be6c7a96d780a7e9870d498f84e7339'
commit8f7312956d76eefd1fbf9567a3bb18634e8db560
authorMarc Delisle <marc@infomarc.info>
Fri, 12 Aug 2011 18:40:56 +0000 (12 14:40 -0400)
committerMarc Delisle <marc@infomarc.info>
Fri, 12 Aug 2011 18:40:56 +0000 (12 14:40 -0400)
treeef502f28e994c64cbcde935c416fbd3d9b4ad6fc
parentb319651b70b95c1c70d084ab8519109dae9e5450
parent1b7e2f6c7be6c7a96d780a7e9870d498f84e7339
Merge commit '1b7e2f6c7be6c7a96d780a7e9870d498f84e7339'
js/messages.php
libraries/config.default.php