Merge remote branch 'hpa/master' into libupload
authorErwan Velu <erwanaliasr1@gmail.com>
Thu, 17 Mar 2011 19:09:10 +0000 (20:09 +0100)
committerErwan Velu <erwanaliasr1@gmail.com>
Thu, 17 Mar 2011 19:09:10 +0000 (20:09 +0100)
commitc705918ca2e0f2df3c2188fe3ef0a9568c97560c
tree94568d2ab3e0b298a2e5dd912d1433d69d0df9a3
parent43258aa5a29a4624350e1d689d9ae1c58c3472fe
parentf7829be535ee09b48502ec60b8e997e5aa946b61
Merge remote branch 'hpa/master' into libupload