| commit | d6908f1a2daae4c6c1980a6fa74892deb8c24cb9 | [log] [tgz] |
|---|---|---|
| author | Wim Taymans <wim.taymans@collabora.co.uk> | Mon Aug 22 13:10:07 2011 +0200 |
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | Mon Aug 22 13:10:07 2011 +0200 |
| tree | b71f50ae670f3efe26294eba0808d15d55c95150 | |
| parent | 9d6371405e13ed6442cc5981aa98957f11af8814 [diff] | |
| parent | 88557c4792d0a5f79a1de144268154dd50743c3d [diff] |
Merge branch 'master' into 0.11