Merge branch 'devel' master
authorDawid Jagieła <lightnir@gmail.com>
Sun, 18 Oct 2015 17:35:08 +0000 (19:35 +0200)
committerDawid Jagieła <lightnir@gmail.com>
Sun, 18 Oct 2015 17:35:08 +0000 (19:35 +0200)

Trivial merge