Merge branch '2.5-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:13:02 +0000 (16:13 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:13:02 +0000 (16:13 +0200)
commit0e7b9f0bbc1c14b66225fb3863e1cf1a17a0b90d
tree5c6a2f47053d3b34916b7b191e6acae415e7b5f6
parent91f7fefbcbfc676a2a97b7aa6d71fbeeadada606
parent1c5be8e9769a5640bb17ec468ca04582368256a1
Merge branch '2.5-maintenance'