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)
commit586209a600ac5767a48c57cae1f566c0d6aaf48a
treeaa0096a6b8f44c10ec2a4dd66409c7525223da3c
parent2be60f0940d7db35d669985cc0f88207eb1d2944
parent7e5bf1ffbcf2dd1d728102f531520258958602d2
Merge branch 'devel'