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)
commit9d96125b14fd5ca06ff1f9788fd2e34e23e931e4
tree7d71b97b357dd824b943a481016faccaa20bf160
parentbd67d302dceda7d27acf6ef628b712c2bbd15e3f
parent2dcffa76183711276884964138bb552684e8046f
Merge branch 'develop' of less.ly:kraken-ui into develop