| commit | 0e7b9f0bbc1c14b66225fb3863e1cf1a17a0b90d | [log] [tgz] |
|---|---|---|
| author | Armin Ronacher <armin.ronacher@active-4.com> | Sun Oct 17 16:13:02 2010 +0200 |
| committer | Armin Ronacher <armin.ronacher@active-4.com> | Sun Oct 17 16:13:02 2010 +0200 |
| tree | 5c6a2f47053d3b34916b7b191e6acae415e7b5f6 | |
| parent | 91f7fefbcbfc676a2a97b7aa6d71fbeeadada606 [diff] | |
| parent | 1c5be8e9769a5640bb17ec468ca04582368256a1 [diff] |
Merge branch '2.5-maintenance'