Merge tag 'upstream/1.2.6'
authorSven Hoexter <sven.hoexter@rewe-digital.com>
Mon, 15 May 2017 15:34:12 +0000 (17:34 +0200)
committerSven Hoexter <sven.hoexter@rewe-digital.com>
Mon, 15 May 2017 15:34:12 +0000 (17:34 +0200)
commitdde84579c22f53e630c51d2817d040bd01c33317
tree59c4801058b60685377a332fec66ad2cf41ee8bf
parent621f98b869c0cfb08c374f27a10684445aabdad6
parent2fa6c5654e0a345af10df5227b77d9f468759f20
Merge tag 'upstream/1.2.6'

Upstream version 1.2.6