Merge tag 'upstream/3.052'
authorSven Hoexter <sven@timegate.de>
Mon, 22 Sep 2014 16:13:00 +0000 (18:13 +0200)
committerSven Hoexter <sven@timegate.de>
Mon, 22 Sep 2014 16:13:00 +0000 (18:13 +0200)
commitef0160440ef423857ed8496d6384f24e5130822f
tree0cd551b7f5e6588a08926def8153c5644a8711db
parent9e769beb427ee86358511c714a8e08912d4df977
parent0a085bb35433261a474838231960d8ee3dc31d5c
Merge tag 'upstream/3.052'

Upstream version 3.052