Merge remote-tracking branch 'hpa/master'
authorErwan Velu <erwanaliasr1@gmail.com>
Wed, 13 Jun 2012 19:25:55 +0000 (21:25 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Wed, 13 Jun 2012 19:25:55 +0000 (21:25 +0200)
commit5ad16de11428a5b9e1aff99da050c3414de4e5dc
treee10a885d39ec03edf0fedd47eda800017feba7b9
parentc3aff69409564a438c2012171a544c229d7ed531
parent753ab4bde224205876f09889ce928acb3682ba73
Merge remote-tracking branch 'hpa/master'