| commit | 2ed03c6d6bd0662a97a23f9b860419629206218d | [log] [tgz] |
|---|---|---|
| author | Armin Ronacher <armin.ronacher@active-4.com> | Sat Jan 28 15:34:25 2017 +0100 |
| committer | Armin Ronacher <armin.ronacher@active-4.com> | Sat Jan 28 15:34:25 2017 +0100 |
| tree | 7d108a45990792e09666cc146881f3199f1bda94 | |
| parent | 059fbe5c0085a52efb63fe8076f9c53e811aa30a [diff] | |
| parent | add79164c421df81022b0b93ebd021cf9ae64096 [diff] |
Merge branch '2.9-maintenance'