Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 20:07:05 +0000 (16:07 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 20:07:05 +0000 (16:07 -0400)
commitff696de2f0743c21f6272a920e41fd0d3ce823b8
tree9331ed84085269f4991be0ea3b2aec708e97bc42
parent688b07d323a79cd589e8a1a1f957ea41e6a9aa28
parente9499b15b5b9c1184befc349f67ffdca55b1777f
Merge branch 'dev' into test