| commit | a1894ed36373d3e0f43f1ac2f1fa0e9cfbfed215 | [log] [tgz] |
|---|---|---|
| author | Wim Taymans <wim.taymans@collabora.co.uk> | Mon Apr 25 11:38:28 2011 +0200 |
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | Mon Apr 25 11:38:28 2011 +0200 |
| tree | bf74474a260fee7da60fa594e8b6a9e69803b0a2 | |
| parent | 2f9a7b1a1b531a81f4e3d6829130d10e92598bcf [diff] | |
| parent | bddac509612362a53a4636dfb53cc9e097f7bf53 [diff] |
Merge branch 'master' into 0.11