jos db4a004e58 Merge branch 'develop' into v2
Conflicts:
	HISTORY.md
2015-02-20 19:56:12 +01:00
..
2015-02-09 21:49:44 +01:00
2015-01-07 10:24:21 +01:00