Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0 into dev
Authored by: Jurgen J. Vinju 2014-06-17
Parent(s): [51dee4][a1e7e2]
Child(ren): [c54339]