Merge branch 'master' of less.ly:kraken-ui into dataset-ui
authordsc <dsc@wikimedia.org>
Wed, 11 Apr 2012 09:09:39 +0000 (02:09 -0700)
committerdsc <dsc@wikimedia.org>
Wed, 11 Apr 2012 09:09:39 +0000 (02:09 -0700)
commitbfaf147b6449edd371bc6dc1458716dac71a04e3
tree051b3201d36b55e46d1c1c639e65e90e357ce9b2
parent56597ffed10111e0b79062de197cae67dc582e30
parent4f4de1940af5bc04ec0afc6e3eac1a640ea38223
Merge branch 'master' of less.ly:kraken-ui into dataset-ui

Conflicts:
lib/graph/graph-model.co
lib/graph/graph-edit-view.co
lib/graph/graph-model.co