]> git.ipfire.org Git - thirdparty/babel.git/commitdiff
Merge branch '1.x-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Wed, 31 Jul 2013 20:50:13 +0000 (22:50 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Wed, 31 Jul 2013 20:50:13 +0000 (22:50 +0200)
1  2 
CHANGES

diff --cc CHANGES
Simple merge