Merge master in lamp-mohamadou branch
authorMohamadou Mbengue <mmbengue@gmail.com>
Wed, 2 May 2012 07:13:48 +0000 (09:13 +0200)
committerMohamadou Mbengue <mmbengue@gmail.com>
Wed, 2 May 2012 07:13:48 +0000 (09:13 +0200)
commit1c0a972309fa624bd01e37e702f56ebb8153fe31
treea57f55f0926b5890064413450aea9bffc96e81a6
parentab7377d1e1691679b0a31c2dd8021855c6538a99
parent987ab29bba8809117007534d3c6ec8073e57f548
Merge master in lamp-mohamadou branch