Merge branch 'devel'
authorDawid Jagieła <lightnir@gmail.com>
Thu, 8 Oct 2015 17:43:21 +0000 (19:43 +0200)
committerDawid Jagieła <lightnir@gmail.com>
Thu, 8 Oct 2015 17:43:21 +0000 (19:43 +0200)

Trivial merge