Merge remote-tracking branch 'hpa/master'
authorErwan Velu <erwanaliasr1@gmail.com>
Wed, 30 May 2012 19:17:11 +0000 (21:17 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Wed, 30 May 2012 19:17:11 +0000 (21:17 +0200)
commitc3aff69409564a438c2012171a544c229d7ed531
tree9ff054c1f4364aad0d406abb6c9020276bde3b85
parentdca99112185bdb2065821e924a70e83a4fb4100b
parentba42e1409ece2e9d56728e0ee6a6342c05ec6e52
Merge remote-tracking branch 'hpa/master'