Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 16 May 2011 18:36:47 +0000 (14:36 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 16 May 2011 18:36:47 +0000 (14:36 -0400)
commitc942b90d020c63a9561d0404aac8fbdc56cc47a7
treed948b5687da8973249a161b546e0f36ac12866e9
parent76c6173d4d170e3cc4c08018a6625a2da6ae13ea
parent29dffede0079ba7b85b5394cc154e95bebb0c382
Merge branch 'dev' into test