Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0 into dev
Authored by: Bas Basten 2014-06-16
Parent(s): [6c3141][8c6723]
Child(ren): [56f205][6d5e93][ec370b]