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)
commit032602b8595c511c6002f9f1db0360bf83c3cceb
treecc48fd62bd94d815f60a82053fd20215e69dd7b0
parentc2ef858a1d29293dddd34e4c130c2ef3dcd0021b
parente5b14ae1b6c3aa50a7fe3f88127578938fa332bd
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