Merge master in lamp-mohamadou branch
authorMohamadou Mbengue <mmbengue@gmail.com>
Mon, 23 Apr 2012 12:44:23 +0000 (14:44 +0200)
committerMohamadou Mbengue <mmbengue@gmail.com>
Mon, 23 Apr 2012 12:44:23 +0000 (14:44 +0200)
commite699b010ce10ae31f5b5c82b8f4b92cd1309404d
tree2af229329d9aaff7aeaa8be89c4e199f3d8f04d2
parent99db12c909c954fa3fbdecaef885d803974c2c8d
parent74fbe0f07f0af7d38f710719e30a86b9b4ff3845
Merge master in lamp-mohamadou branch