Merge branch 'dev' of https://opensourceprojects.eu/git/p/ossmeter/code-0 into dev
Authored by: Ashim Shahi 2014-06-19
Parent(s): [4d3820][eba435]
Child(ren): [8958a4]