commit | 23828690cf20fbf6590c7b19d7eb1b13baef92a2 | [log] [tgz] |
---|---|---|
author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | Sat Dec 28 12:56:15 2013 -0500 |
committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | Sat Dec 28 12:56:15 2013 -0500 |
tree | 39187fde5815cc479d927b47a3628978cbff7a7e | |
parent | 30f22f1ee19d8ff9df35d2a04b454a8da9af1a89 [diff] | |
parent | b50927e8dba16142205684ff9cdeab8b03d57b50 [diff] |
Merge remote-tracking branch 'origin/master' into certificates-and-stuff