tree d9010d1eb175acbeb880baa7e52fb869fa3f35b4
parent 50a0e950f20cdd833e8d80dbc0d72026e1667b15
parent ee0af7b3cc800f969e11558b2329082190ade888
author Piotr Krysik <ptrkrysik@gmail.com> 1463202915 +0200
committer Piotr Krysik <ptrkrysik@gmail.com> 1463202915 +0200

Merge branch 'master' into development