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)
commite68d9e77d5f55a368839223126c5c55f313f0b91
treeaf5186f3499719a8cdc2565d792b5bde46d42f4f
parent586209a600ac5767a48c57cae1f566c0d6aaf48a
parent8dda5b8d75cae3250bf8f1c4fc4bdb69745f5985
Merge branch 'devel'