Merge branch '2.5-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:02:23 +0000 (16:02 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:02:23 +0000 (16:02 +0200)
commitf2cd943c03f2503ca71c4841a542791391cc6eae
tree6fb860b020207cd94773d4ff44b798809ba2a284
parentf55b1a4edf68a7b4403082ed2564fc7dd2de98b3
parent3dd4155f2df170851a0b0d763230c270b9320be1
Merge branch '2.5-maintenance'