Merge branch 'test' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 11 May 2011 19:47:56 +0000 (15:47 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 11 May 2011 19:47:56 +0000 (15:47 -0400)
commit0ec7ffa737955ab654f29bf642cd0eb170cc3ed9
tree63fbb7f71f0fdc5f08040ce0f46b4eb23d1f1a7e
parentd8813f19a46d721940beecf772ab2de125436704
parent7eff0820be985bb6d4082bde5b9cba3a3385fa45
Merge branch 'test' into dev