| commit | 769a9791a483e9c5e79fab8ecd5c1d148fc36567 | [log] [tgz] |
|---|---|---|
| author | Wim Taymans <wim.taymans@collabora.co.uk> | Wed Nov 02 10:31:24 2011 +0100 |
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | Wed Nov 02 10:31:24 2011 +0100 |
| tree | 935673ac46bddcb0057daabdae692a8846061499 | |
| parent | b39f4a80f72465bb2eb2498f026fa1300d764332 [diff] | |
| parent | d4105d4b56b0b07d8994abf92db620ba1f533ab0 [diff] |
Merge branch 'master' into 0.11