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)
commit307c5fc8fe46baa8a1968f32a41d47d19cfcbf0a
tree0de2d4acdb4fc147b04c177f83617981e07a6675
parent309c673db00a78a38c37c3790ee6b4fae5744e6c
parent4efb596cee7f7cc961990f8dffc3b210e579e49c
Merge tag 'upstream/1.0.0'

Upstream version 1.0.0