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/?a=commitdiff_plain;h=547de7745e81eacfc08840e538acc57c347a6985;hp=129284f2e355feb0c9fd20cd2d6f3259bfaa0c2d;p=muf-repository

Merge branch 'release-1.0'
---