Merge branch 'master' into olivier
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 21 Mar 2012 20:49:38 +0000 (16:49 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 21 Mar 2012 20:49:38 +0000 (16:49 -0400)
commit11fe86a10a8c11906d118040cb2a0fc6baece772
treece81b2ab8960f6b868c645ed5e96ba28860e333c
parent89f07bff202529338851d4fb1b075d5059f3135a
parent460771c152c1ca53388b81561a3b8ecc8a691abd
Merge branch 'master' into olivier