Merge tag 'upstream/1.0.1'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 8 Oct 2012 09:05:31 +0000 (11:05 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 8 Oct 2012 09:05:31 +0000 (11:05 +0200)
commit8458af77602b092d503472faeb54e4944d81cff1
tree497e6686d052afecae8d8e60d87a177dbcbd24f2
parent3cf1e9acd93bc7803a4b23fd7ece63c02ab3f436
parent2bc953e5221beebc755e4ec14d51d215652f2cf1
Merge tag 'upstream/1.0.1'

Upstream version 1.0.1