Merge branch 'master' of less.ly:kraken-ui into dataset-ui
authordsc <dsc@wikimedia.org>
Thu, 12 Apr 2012 22:49:16 +0000 (15:49 -0700)
committerdsc <dsc@wikimedia.org>
Thu, 12 Apr 2012 22:49:16 +0000 (15:49 -0700)
commit8c7844e954669765dc5ccb51702f668f6ee48d4f
tree0f310310f4c60f893cc943810325ecf1a49283c0
parentb16106234d4917a0a70247389a9abc355a803b71
parent995e11fb95feb6d2a0c562d975c9e3420032f758
Merge branch 'master' of less.ly:kraken-ui into dataset-ui

Conflicts:
lib/base.co
lib/graph/graph-model.co
lib/graph/graph-model.co
lib/template/graph-display.jade
lib/util/cascade.co