Merge branch 'master' of http://github.com/nokok/karaffe
Merge branch 'master' of github.com:PaLTree/notepad-java