| commit | a1ee369167bc57afaae1cd634b40df171a5ffb69 | [log] [tgz] |
|---|---|---|
| author | Erik Trauschke <erik.trauschke@gmail.com> | Thu Oct 15 15:34:47 2015 -0700 |
| committer | Erik Trauschke <erik.trauschke@gmail.com> | Thu Oct 15 15:34:47 2015 -0700 |
| tree | 00162870e409ccefde78b8dad6b1c9e463f62009 | |
| parent | af3ea78c9ad85cc0688797eb0da8f828812f3f49 [diff] |
Merge branch 'master', remote-tracking branch 'upstream/master'