Merge branch 'release/0.6.0' into production
authormark burdett <mfburdett@gmail.com>
Sat, 2 Feb 2013 21:47:53 +0000 (13:47 -0800)
committermark burdett <mfburdett@gmail.com>
Sat, 2 Feb 2013 21:47:53 +0000 (13:47 -0800)
commit3662fc58b1b23740ea988837cf70b4c4f217878d
tree845fb564115b9d9f2e86106eaaf646c99c245c44
parent6f4e106170a2094dc1abf6a4aed941191c2546b6
parent7e5b06b111b5da9938b5449d4186dcb3c0b14133
Merge branch 'release/0.6.0' into production