Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 23 Nov 2011 09:23:28 +0000 (10:23 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 23 Nov 2011 09:23:28 +0000 (10:23 +0100)
commitc5cad2aff2031b355c92f0a509ee5d731a6ba8ba
tree6cfdcdd2507f8d61cd92701015c7c2e706bcd550
parentbb3fbfc18e30ca8ec3370ccd685cb9e46f8efc08
parent38c9fefa0127b4773b102c070af9e3e01d74264e
Merge branch 'master' into 0.11
tests/check/Makefile.am