From: David Schoonover <dsc@wikimedia.org>
Date: Thu, 5 Jul 2012 21:28:11 +0000 (-0700)
Subject: Merge branch 'develop' with the Middleware updates.
X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=9a31bfa4f8d82885d615326a751392c9fe045b9b;p=kraken-ui.git

Merge branch 'develop' with the Middleware updates.
---

9a31bfa4f8d82885d615326a751392c9fe045b9b