Merge remote-tracking branch 'origin/dataset-ui' into develop
authordsc <dsc@less.ly>
Tue, 15 May 2012 22:18:30 +0000 (15:18 -0700)
committerdsc <dsc@less.ly>
Tue, 15 May 2012 22:27:06 +0000 (15:27 -0700)
commitba2f2aa7214d667af86d936d15b91b240ef1bfc5
tree62e330028dfc021c39837920a1433685ac0263e5
parenta976aefc16faf1767461aa85a3e8c4626929570b
parent3230dc25bbf925cec9faf6302bac9c3518fc25c0
Merge remote-tracking branch 'origin/dataset-ui' into develop

Conflicts:
lib/dashboard/dashboard-view.co
lib/graph/graph-display-view.co
lib/graph/graph-edit-view.co
lib/server/controllers/graph.co
lib/server/server.co
lib/template/graph-display.jade
lib/graph/graph-display-view.co
lib/graph/graph-edit-view.co
lib/server/controllers/graph.co
lib/server/server.co
lib/template/dashboard.jade
lib/template/graph-display.jade
www/layout.jade
www/modules.yaml