tree bdbb6bac85fafc74bc26f2d423a609816044f353
parent 816d2a0eac005471dc869b87ebbccc10a1e27781
parent 808bb63f2c790bb48c6e63a8abfb467a75d8d552
author Jon Perritt <jrperritt@gmail.com> 1397511527 -0500
committer Jon Perritt <jrperritt@gmail.com> 1397512755 -0500

merging in changes from v0.2.0 branch