Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0 into dev
Authored by: Bas Basten 2014-09-23
Parent(s): [bfc8be][f52e83]
Child(ren): [fdf308]