]> git.ipfire.org Git - thirdparty/babel.git/commitdiff
Merge branch '1.x-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 27 Jul 2013 11:00:09 +0000 (13:00 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 27 Jul 2013 11:00:09 +0000 (13:00 +0200)
1  2 
CHANGES
setup.py

diff --cc CHANGES
Simple merge
diff --cc setup.py
Simple merge