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)
commit341684dc4e4d208f576a5e14ed6fb5e59b150a17
tree175d6c5369e7a87d3f63f9769d44d2aee513f617
parent332c04f1e530b074ec6153391eabcaa5c71df1c7
parentb04933c223ec43df391736b7fe3d4ae02fa7660c
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