Merge tag 'upstream/1.0.1'
authorSven Hoexter <sven@stormbind.net>
Tue, 5 Feb 2013 20:11:51 +0000 (21:11 +0100)
committerSven Hoexter <sven@stormbind.net>
Tue, 5 Feb 2013 20:11:51 +0000 (21:11 +0100)
commit051cf40559ed4c4ee96de6d7147bc64881de8c03
tree64a86be1e6be1df15b321e28fdcbac1b98458f26
parent5a13c40c1fe1fec033ae5df6e9a66a17fef45deb
parentce055aa572264a45b3749be840ff2a8f51fc4ef0
Merge tag 'upstream/1.0.1'

Upstream version 1.0.1