Merge tag 'upstream/1.0.0'
authorSven Hoexter <sven@timegate.de>
Tue, 22 Jan 2013 12:38:28 +0000 (13:38 +0100)
committerSven Hoexter <sven@timegate.de>
Tue, 22 Jan 2013 12:38:28 +0000 (13:38 +0100)
Upstream version 1.0.0


Trivial merge