tree ee7318dd0feccef71f9d92804e3d88694ee5380e
parent bb7c3df8e8656646aa405969ca86bf634740cfab
parent 9a2421617d7140937738427ec6c35989339a1dfd
author Michael Hanl <micha.hanl@gmail.com> 1464945922 +0200
committer Michael Hanl <micha.hanl@gmail.com> 1464945922 +0200

merge conflict resolution