| commit | b78f2617b04cc549ed5fea4eca944c4d8054d187 | [log] [tgz] |
|---|---|---|
| author | Armin Ronacher <armin.ronacher@active-4.com> | Fri Nov 20 09:05:39 2015 |
| committer | Armin Ronacher <armin.ronacher@active-4.com> | Fri Nov 20 09:05:39 2015 |
| tree | c1724823733f033e862333a9f06affde3361200f | |
| parent | 6f7e161c6805c2479eaee8bc3fce5b3c1b994647 [diff] | |
| parent | 8189d2164dd671c7607771cc132c684f512b8bee [diff] |
Merge branch '2.8-maintenance'