Merge branch 'master' into newmc

author Marius Gavrilescu <marius@ieval.ro>

Mon, 20 Apr 2015 07:42:21 +0000 (10:42 +0300)

committer Marius Gavrilescu <marius@ieval.ro>

Mon, 20 Apr 2015 07:42:21 +0000 (10:42 +0300)
author Marius Gavrilescu <marius@ieval.ro>
Mon, 20 Apr 2015 07:42:21 +0000 (10:42 +0300)
committer Marius Gavrilescu <marius@ieval.ro>
Mon, 20 Apr 2015 07:42:21 +0000 (10:42 +0300)
diff --cc css/custom.css
Simple merge
diff --cc js/90-themes.js
Simple merge
author	Marius Gavrilescu <marius@ieval.ro>
	Mon, 20 Apr 2015 07:42:21 +0000 (10:42 +0300)
committer	Marius Gavrilescu <marius@ieval.ro>
	Mon, 20 Apr 2015 07:42:21 +0000 (10:42 +0300)
		1	2
css/custom.css	patch \|	diff1 \|	diff2 \|	blob \| history
js/90-themes.js	patch \|	diff1 \|	diff2 \|	blob \| history