| commit | 6623ab258b247e042b597058c47b91a5eddf0a8b | [log] [tgz] |
|---|---|---|
| author | Wim Taymans <wim.taymans@collabora.co.uk> | Thu Feb 16 14:23:50 2012 +0100 |
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | Thu Feb 16 14:23:50 2012 +0100 |
| tree | 44f7fb9076a579be3e86180e9d04681bf7cf2fec | |
| parent | 979431c034edd48f9d82c9a3982009177067c2d9 [diff] | |
| parent | c1c858f2733aba9fd8f6120656b0db20a66b6c77 [diff] |
Merge branch 'master' into 0.11