tree b71f50ae670f3efe26294eba0808d15d55c95150
parent 9d6371405e13ed6442cc5981aa98957f11af8814
parent 88557c4792d0a5f79a1de144268154dd50743c3d
author Wim Taymans <wim.taymans@collabora.co.uk> 1314011407 +0200
committer Wim Taymans <wim.taymans@collabora.co.uk> 1314011407 +0200

Merge branch 'master' into 0.11