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)

Trivial merge