tree e70bab29f5040e5e6a5971cbacb8bf89d11c412d
parent ec4ff0a836f18d39c36987c6a8ee3d5b69c54849
parent b32564149e1e823d0b09bd4ac82fcae5c06468f5
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1355909252 +0100
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1355909252 +0100

Merge tag 'upstream/1.0.4'

Upstream version 1.0.4