Merge branch 'devel'
authorMarek Marecki <marekjm@ozro.pw>
Tue, 5 May 2015 21:02:53 +0000 (23:02 +0200)
committerMarek Marecki <marekjm@ozro.pw>
Tue, 5 May 2015 21:02:53 +0000 (23:02 +0200)
commit0c9a23b6b86fc4231aec35166b70d536ec23a21f
tree059f44f7e366d4131274b21564374c7852d3dd27
parent9f3d82aec6dd877e4d1b5280ec1ec380dd4b4777
parent5408fc4928389d117c2bbeb09b59801ddba51375
Merge branch 'devel'