From: erosen <erosen@wikimedia.org>
Date: Fri, 29 Jun 2012 19:23:40 +0000 (-0700)
Subject: Merge branch 'evan' into develop
X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=4f770008ca6f155b4eb70675683736a54cd3a77e;p=kraken-ui.git

Merge branch 'evan' into develop
---

4f770008ca6f155b4eb70675683736a54cd3a77e