Merge remote-tracking branch 'hpa/master'
authorErwan Velu <erwanaliasr1@gmail.com>
Fri, 25 May 2012 21:08:35 +0000 (23:08 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Fri, 25 May 2012 21:08:35 +0000 (23:08 +0200)
commit11f968df22c4c98b6b73b48a4d5f7a2230fe88ed
treee497b53b221f77ca0887e2bc8209cb4824ec442e
parent02055a8310be4faf56040fee5713d24235d9786e
parent7c1b588f9a918b5e251773f0ef4f3812859cc159
Merge remote-tracking branch 'hpa/master'