| commit | f08e247051c5c6d0aaacc29f99a2b0bb9de8405e | [log] [tgz] |
|---|---|---|
| author | Wim Taymans <wim.taymans@collabora.co.uk> | Fri Feb 17 09:01:56 2012 +0100 |
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | Fri Feb 17 09:01:56 2012 +0100 |
| tree | bccf72b7de9d5db683864ac1948a0f50c6303c2b | |
| parent | 2fca270f1956fa3379ebca02203e3f95ae8aba42 [diff] | |
| parent | 39bad1d6ca2600eb9d2ad46e3842b8a564cf6c43 [diff] |
Merge branch 'master' into 0.11