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)
commit555545d38bece9e6d402f64d8dfda14547fe2c24
tree6171ba0e5340594b6d2a1972cbafd6d9fd34b06d
parentb30f8f3a8d29805e11c6ef7f80c5a0664b328e48
parent50f72f802f0e48d4854ea748ce529f1eaeac45f2
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