Merge branch 'devel'
authorDawid Jagieła <lightnir@gmail.com>
Wed, 7 Oct 2015 12:33:34 +0000 (14:33 +0200)
committerDawid Jagieła <lightnir@gmail.com>
Wed, 7 Oct 2015 12:33:34 +0000 (14:33 +0200)

Trivial merge