Merge branch 'hotfix' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 30 Mar 2012 16:03:23 +0000 (12:03 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 30 Mar 2012 16:03:23 +0000 (12:03 -0400)
commit5db6ce780bbf6b9a0a096a9157ae06b537ae46cd
tree415ec4edead34f55abc615710bb46fafc6cc266a
parent4cc81304f11fa336c41a4505525e7221ca3d827a
parent8d919ba8116251bda90eab9df35b155568eb95c5
Merge branch 'hotfix' into dev