From: David Schoonover <dsc@wikimedia.org>
Date: Sun, 1 Jul 2012 06:54:36 +0000 (-0700)
Subject: Merge branch 'develop'
X-Git-Url: http://git.lttlst.com:3516/?a=commitdiff_plain;h=46df55894141608dde9fb78492d56af42d5020d8;p=kraken-ui.git

Merge branch 'develop'
---

46df55894141608dde9fb78492d56af42d5020d8