Merge tag 'upstream/1.0.2'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 25 Oct 2012 12:11:07 +0000 (14:11 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 25 Oct 2012 12:11:07 +0000 (14:11 +0200)
commit5ce1cd2d0283de312fd2097c5d0382258fb50e1e
tree934235175137b8d44ece23b2ebbc5d7e4418edfa
parent06b03237eb43101d60810eaacacadcef92236b36
parent6a5ec01275b38c0a0193bd344a5cd0954e49a448
Merge tag 'upstream/1.0.2'

Upstream version 1.0.2