tree a924f89b3950249f9336adc975e08c3af74b1d78
parent 3894add8a972aa2f2aeb2a2b8e686efd03039530
parent 3ba989378692e90d3f06ab087b814fcf1a8eacd9
author Michael Crosby <crosby.michael@gmail.com> 1381970897 -0700
committer Michael Crosby <crosby.michael@gmail.com> 1381970897 -0700

Merge branch 'master' into bump_0.6.4