Merge branch 'master' into v4.6.x
authorArun Persaud <arun@nubati.net>
Thu, 23 Feb 2012 07:19:04 +0000 (23:19 -0800)
committerArun Persaud <arun@nubati.net>
Thu, 23 Feb 2012 07:19:04 +0000 (23:19 -0800)
Conflicts:
po/da.po
po/uk.po

used version from master

1  2 
configure.ac

diff --cc configure.ac
Simple merge