Merge branch 'hotfix' into olivier
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 26 Mar 2012 14:39:30 +0000 (10:39 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 26 Mar 2012 14:39:30 +0000 (10:39 -0400)
commit664617d0ac030c9e400ada1c844d39761c11383f
tree4ce83345673b3d109839f66219f57fd92e6a8eba
parent59c67b87fe10fedbbd150864460586f654cb0bff
parent241907adcdafb689e8ed58c1f02b23a86f46cc3e
Merge branch 'hotfix' into olivier