Merge branch 'olivier' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 30 Mar 2012 15:02:23 +0000 (11:02 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 30 Mar 2012 15:02:23 +0000 (11:02 -0400)
commit70f49e97ac4754ba5bb2e71788d554916b15b645
tree8fdfccd5dcbc441fa69c0607aa73d8db1a73653d
parentffed35618fe70bad878bbdc251f61009d5141396
parent5dfc3761b37f8515410cb1510da34e2c0e2170ef
Merge branch 'olivier' into test