Merge branch 'devel'
authorDawid Jagieła <lightnir@gmail.com>
Fri, 18 Sep 2015 07:35:31 +0000 (09:35 +0200)
committerDawid Jagieła <lightnir@gmail.com>
Fri, 18 Sep 2015 07:35:31 +0000 (09:35 +0200)

Trivial merge