Merge branch 'merge-dataprotocol-library-into-gdp-plugin' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 25 Dec 2011 23:25:34 +0000 (23:25 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 25 Dec 2011 23:25:34 +0000 (23:25 +0000)
commit9414306d062aaab5e4930f641156334716b32d3c
treed247c496c951f0a7fcf2b3b6e14ccc4eeaa557a1
parent17359744f34938dcd7675abd78c7ca584c6a353d
parent3be7c22bd4109137bae90b86801c1aa710407fc1
Merge branch 'merge-dataprotocol-library-into-gdp-plugin' into 0.11