Merge branch 'master' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 5 Aug 2011 12:54:33 +0000 (08:54 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 5 Aug 2011 12:54:33 +0000 (08:54 -0400)
commit8b0b1d99d40f1e9ca58f7e50befd478f3dcc54a6
tree52299bf900dd2174eb2c9b590a9f4736a5401628
parent1805b80dcd97ec65423500901a6f349213285dc7
parent45623684f2ac3b8aff1eb936b418ef50fff5648d
Merge branch 'master' into dev