Merge tag 'upstream/1.1.0'
authorSven Hoexter <sven@timegate.de>
Mon, 25 Aug 2014 17:47:51 +0000 (19:47 +0200)
committerSven Hoexter <sven@timegate.de>
Mon, 25 Aug 2014 17:47:51 +0000 (19:47 +0200)
commitfafa077eddb099165e156853d3d25662fcf5bf30
tree2a20c2d9f444b13862cc87a499aababa0eb6d62d
parentaacb4700a596f48974d10036e9d62e84f3cf2ef2
parentf77812e8b678b8bf620bfbf33882139997ccda34
Merge tag 'upstream/1.1.0'

Upstream version 1.1.0