Merge branch 'master' into d3-testing

author declerambaul <fabian.kaelin@gmail.com>

Tue, 17 Apr 2012 02:08:06 +0000 (22:08 -0400)

committer declerambaul <fabian.kaelin@gmail.com>

Tue, 17 Apr 2012 02:08:06 +0000 (22:08 -0400)
author declerambaul <fabian.kaelin@gmail.com>
Tue, 17 Apr 2012 02:08:06 +0000 (22:08 -0400)
committer declerambaul <fabian.kaelin@gmail.com>
Tue, 17 Apr 2012 02:08:06 +0000 (22:08 -0400)
diff --cc lib/server/server.co
Simple merge
diff --cc www/modules.yaml
Simple merge
author	declerambaul <fabian.kaelin@gmail.com>
	Tue, 17 Apr 2012 02:08:06 +0000 (22:08 -0400)
committer	declerambaul <fabian.kaelin@gmail.com>
	Tue, 17 Apr 2012 02:08:06 +0000 (22:08 -0400)
		1	2
lib/server/server.co	patch \|	diff1 \|	diff2 \|	blob \| history
www/modules.yaml	patch \|	diff1 \|	diff2 \|	blob \| history