Merge tag 'v2.6.0'
commit0b638234b2c9d20426b7888ed44d73a6a8a49a45
authorStefan Weil <sw@weilnetz.de>
Sat, 14 May 2016 17:29:29 +0000 (14 19:29 +0200)
committerStefan Weil <sw@weilnetz.de>
Sat, 14 May 2016 17:29:29 +0000 (14 19:29 +0200)
tree536281612f8b95a3a132ac1e0251a8f50964a49f
parentfe043d06a357d81ceea27e203e5deee016a3d295
parentbfc766d38e1fae5767d43845c15c79ac8fa6d6af
Merge tag 'v2.6.0'

v2.6.0 release