Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0 into dev
Authored by: Jurgen J. Vinju 2014-06-19
Parent(s): [2efa52][8562dd]
Child(ren): [9ee65e][ffc7e0]