Revision b2beca83e0edecddb45c4d21f2f939d0282031a2

Committed on 07/08/2015 6:37 am by jan <jan@jan-desktop> [GitHub Diff]

fix ab merge error, some code cleanup