nixilla Merge branch 'release/0.5'
e0d17f0 Oct 9, 2013
Merge branch 'release/0.5'
e0d17f0