| commit | 27ffd01f95cad7740497a32b22e4ef9d29762162 | [log] [tgz] |
|---|---|---|
| author | Armin Ronacher <armin.ronacher@active-4.com> | Fri Jan 10 10:43:55 2014 +0000 |
| committer | Armin Ronacher <armin.ronacher@active-4.com> | Fri Jan 10 10:43:55 2014 +0000 |
| tree | c497581642fef3ca1a56bad8ad6450d96e18edf8 | |
| parent | f6c6fe4382dd54ea8ace77300e387652bfbbde6b [diff] | |
| parent | 5662125f794f41ac73849a95a9e572e0e5a98b4e [diff] |
Merge branch '2.7-maintenance'