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