| commit | d67288dd03b4cf31fc230b4c1798371d0280059e | [log] [tgz] |
|---|---|---|
| author | Wim Taymans <wim.taymans@collabora.co.uk> | Tue Apr 19 16:25:28 2011 +0200 |
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | Tue Apr 19 16:25:28 2011 +0200 |
| tree | f75293c19d5f8d52986d4b649258f9d6518ccb81 | |
| parent | 4aa6ca55783f9d924e8d2b7b021835d11b9a18ca [diff] | |
| parent | bdb8bbc10024c259cf978bc3e1e9e5cb5670752b [diff] |
Merge branch 'master' into 0.11