tree 6d2e22ab8e1d5466e8a0d44e7634041ccc5154a2
parent 311d79c9c57a7ece7945a665ed0481bac237353f
parent e6e8f1d1586630763494abc326993ddd5eda20a0
author Michael Kutý <6du1ro.n@gmail.com> 1447166245 +0100
committer Michael Kutý <6du1ro.n@gmail.com> 1447166245 +0100

Merge branch 'hotfix/monkey_patch' into master-3