Merge tag 'upstream/1.2.1'
authorSven Hoexter <sven@stormbind.net>
Wed, 7 Oct 2015 09:53:52 +0000 (11:53 +0200)
committerSven Hoexter <sven@stormbind.net>
Wed, 7 Oct 2015 09:53:52 +0000 (11:53 +0200)
commit0c79c86cba9d783efa6e21a9d5090d296fa81992
tree20fd9c2506e6b9f2a1e0ab37e183b120302e6557
parent139c08ebdd857e5957821cab24516be3704e82c3
parent9420cfdeee25e4d97e7fc6f7cbb286e5089caccb
Merge tag 'upstream/1.2.1'

Upstream version 1.2.1