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)
Upstream version 1.0.1


Trivial merge