Merge tag 'upstream/1.1.1'
authorSven Hoexter <sven@stormbind.net>
Sun, 19 Apr 2015 11:40:35 +0000 (13:40 +0200)
committerSven Hoexter <sven@stormbind.net>
Sun, 19 Apr 2015 11:40:35 +0000 (13:40 +0200)
commit1b06527ab91d1d42c4a0e2cc13acc86fbdc78641
treeddc007577af6b53fa9f5a96504283d9c8911fa4c
parent0307b68d5ec9469973027570155402795ea1218f
parent9c08378bfbf14696495ca8e3507d7f46daba8a3f
Merge tag 'upstream/1.1.1'

Upstream version 1.1.1