Merge branch 'develop' of less.ly:kraken-ui into develop d3-chart-element
authorerosen <erosen@wikimedia.org>
Fri, 29 Jun 2012 19:25:21 +0000 (12:25 -0700)
committererosen <erosen@wikimedia.org>
Fri, 29 Jun 2012 19:25:21 +0000 (12:25 -0700)
commit07a93259a120b2704c2731edaf616e055a704faf
treef5407c04e2bfeb057d4092e7ef9ab389377490de
parent4f770008ca6f155b4eb70675683736a54cd3a77e
parent2efc70fcd789548709a1327bb1f0fd3f0a712c20
Merge branch 'develop' of less.ly:kraken-ui into develop