commit | e9df54819c85da821f62eb34f4af4b6781f0c559 | [log] [tgz] |
---|---|---|
author | Wim Taymans <wim.taymans@collabora.co.uk> | Wed Aug 24 14:16:44 2011 +0200 |
committer | Wim Taymans <wim.taymans@collabora.co.uk> | Wed Aug 24 14:16:44 2011 +0200 |
tree | 9ca69d0188d48dddf4daf4f02151dbcb0808b478 | |
parent | 60f0e44bf6b717047b9d38523a07148f2966123c [diff] | |
parent | f3fc3e1f69587e1bda5e628093918a2a3dd5f874 [diff] |
Merge branch 'master' into 0.11