Merge remote-tracking branch 'upstream/master'
commit5744ae7ee18440e8b14dfc111a6fdd77f0e6abb8
authorStephane Letz <letz@grame.fr>
Wed, 14 Nov 2012 09:56:38 +0000 (14 10:56 +0100)
committerStephane Letz <letz@grame.fr>
Wed, 14 Nov 2012 09:56:38 +0000 (14 10:56 +0100)
tree24964a9bb011b5402fd6b04489e83830fca5332c
parent335da63e26ce60aa3e23f4653fb5433a27bcee5f
parent48180257390d13588563e4f90190a0ff3ad92a7b
Merge remote-tracking branch 'upstream/master'