Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0 into dev
Authored by: Bas Basten 2014-06-16
Parent(s): [a1da85][ff06c1]
Child(ren): [5aeddd]