Merge branch '1.0.x'
authorlianah <lianahady@gmail.com>
Tue, 26 Feb 2013 21:02:52 +0000 (16:02 -0500)
committerlianah <lianahady@gmail.com>
Tue, 26 Feb 2013 21:02:52 +0000 (16:02 -0500)

Trivial merge