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)
commit786098016329c9e8b0a8d545dcba2a53da0760d5
tree29f32adaf8f719b8be075cff01a9d4b6e195de17
parentd209864c927fec4daead21186896151407f57fe4
parentbdb58f6531db56a7c150082e1d105bbaa3d76538
Merge branch 'devel'