Merge master in lamp-mohamadou branch
authorMohamadou Mbengue <mmbengue@gmail.com>
Tue, 15 May 2012 09:19:32 +0000 (11:19 +0200)
committerMohamadou Mbengue <mmbengue@gmail.com>
Tue, 15 May 2012 09:19:32 +0000 (11:19 +0200)
commit26fe0ded45cb25e9da7b972e65d746eb3dc73463
treedbe947c02abf55d8eae85e4e51a4af5e53ea68a3
parentcc4687fd6198bb36707d0e74f839826afcd1b220
parentd2b26b50b776085e7eefe75c18cd91dad878f44b
Merge master in lamp-mohamadou branch