Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0
Authored by: Bas Basten 2014-06-16
Parent(s): [83d110][e14379]
Child(ren): [19ea3c]