| commit | 0e939c1e0021b40491789a082eec8ddb422ecc2d | |
| author | Andrea Shepard <andrea@persephoneslair.org> | |
| Wed, 10 Jun 2015 15:03:22 +0000 (10 15:03 +0000) | ||
| committer | Andrea Shepard <andrea@persephoneslair.org> | |
| Wed, 10 Jun 2015 15:03:22 +0000 (10 15:03 +0000) | ||
| tree | f8456ddc819150ed24e5916d71d75027fd8ed02a | treesnapshot (tar.gz zip) |
| parent | 2f17b91ae2ca622294bf63dec2a6986756685702 | commitdiff |
| parent | 1eb2c0cbd3a9be2650419bd07474770629261f56 | commitdiff |
Merge branch 'maint-0.2.6' into release-0.2.6