Merge branch 'master' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 6 Nov 2012 19:49:26 +0000 (14:49 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 6 Nov 2012 19:49:26 +0000 (14:49 -0500)
commit26b53326465c78009e318513db4f2d2b89749c1c
tree2421c9607c22c2b272f2c95cb55fe405d1345ef3
parent086c1d4d16489b4936b3404b3a75aa6a0cbc5caf
parent95aeea29cfabb62a59266dd4bc1a7fd7f1a054de
Merge branch 'master' into dev