tree 49d8226ff90206a3c9d66de9e7723d37e70449dc
parent f18053ff797771edf20130ce2a0820eddab152b9
parent 6b02fe499861ff8f950ba1b142b78833c2ffd087
author Jakub Pavlik <pavlk.jakub@gmail.com> 1424623768 +0100
committer Jakub Pavlik <pavlk.jakub@gmail.com> 1424623768 +0100

Merge branch 'develop' into 'master'

Develop

See merge request !1