From: Justin Wind <justin.wind@gmail.com>
Date: Wed, 12 Dec 2012 20:35:08 +0000 (-0800)
Subject: Merge branch 'release-1.0'
X-Git-Url: http://git.squeep.com/?p=muf-repository;a=commitdiff_plain;h=547de7745e81eacfc08840e538acc57c347a6985

Merge branch 'release-1.0'
---

547de7745e81eacfc08840e538acc57c347a6985