Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 12 May 2011 14:42:47 +0000 (10:42 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 12 May 2011 14:42:47 +0000 (10:42 -0400)
commit76c6173d4d170e3cc4c08018a6625a2da6ae13ea
tree46c1cce042e0440bb3f5efa669db3a9e488ed216
parent6e266d9f4a85d7a8ffa31882573eee941c0c8816
parentf42c6e202e67800a20d9a4f86d033abe5c9c511b
Merge branch 'dev' into test