Merge branch 'develop' of less.ly:kraken-ui into develop develop
authorDavid Schoonover <dsc@wikimedia.org>
Tue, 10 Jul 2012 11:27:30 +0000 (04:27 -0700)
committerDavid Schoonover <dsc@wikimedia.org>
Tue, 10 Jul 2012 11:27:30 +0000 (04:27 -0700)
commitcc5a555c8190448191946dd36d90f61881e432f2
treec52e34fea0040f48238679d8973ce4927cbbecc6
parent3ec3f7f8c97bc26fcc8eafd4fad67f9e4b084d3b
parent699ba06329ac45dbffa6d14af46339c53dda1f19
Merge branch 'develop' of less.ly:kraken-ui into develop