| commit | 17eca487a1e8a6b15cefdf6d61022cddbebde428 | [log] [tgz] |
|---|---|---|
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | Mon Apr 13 20:31:07 2015 -0400 |
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | Mon Apr 13 20:31:07 2015 -0400 |
| tree | fce1fd9090722c3fec64e47cebfe450a7fe83d29 | |
| parent | 8dc37a1ba6276d6a690ed2b21fdb665d6d97ca74 [diff] | |
| parent | 4ca37f747d9dcc21d6f85655895e1e997937a670 [diff] |
merge master, resolve simple conflicts