Merge branch 'release/0.5.2' into production 0.5.2
authormark burdett <mfburdett@gmail.com>
Thu, 20 Oct 2011 21:38:48 +0000 (14:38 -0700)
committermark burdett <mfburdett@gmail.com>
Thu, 20 Oct 2011 21:38:48 +0000 (14:38 -0700)
commit75731f4b52739db753fe08aa293a6867747b8a49
treec6cd15759464724f73a7bccc3ba21cbe29aedbe1
parent20ce64f090df79ed98717f309a6d35031bd178d4
parent60b690f3221579dee7b31727b70df00693bb4b36
Merge branch 'release/0.5.2' into production