Merge remote-tracking branch 'upstream/master'
commit9ebddfe65624d5f7ed579f0c8fe2c71eea9d2a5c
authorStephane Letz <letz@grame.fr>
Tue, 21 Aug 2012 09:04:17 +0000 (21 11:04 +0200)
committerStephane Letz <letz@grame.fr>
Tue, 21 Aug 2012 09:04:17 +0000 (21 11:04 +0200)
tree1f4ccda73b4dc0dbae74fb5ec71ae31db999c997
parent7920fe9d110f8b21f2b20143eb334494dc29b59e
parenta43aad2e91cb552454d466c1c71e3af16a3fb7ea
Merge remote-tracking branch 'upstream/master'