Merge branch 'pickup'
authorMaxime Bourget <bmx007@gmail.com>
Sat, 15 Jun 2013 10:40:48 +0000 (11:40 +0100)
committerMaxime Bourget <bmx007@gmail.com>
Sat, 15 Jun 2013 10:40:48 +0000 (11:40 +0100)
commit2fcd4f92890dd69bc83ff666f24ee59366cf838f
treeca4d494982f8819cac18feeecd67640f5ec607b9
parentdbb33a5d4bd7256adcea4a14fcf1c576ec3fe06a
parentf4680cc25eb18f52ed3505c54497643277f425e9
Merge branch 'pickup'