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)
commit2d0fb98e10ba964a18ff63ea67f5abd04c6df585
tree4dbbe5d5ecd1ca2e18ce289d55f6ac56f6c32dfe
parent9fef7e18374e6bd678c2501c01fccc3c0d7c8545
parent5e903d5a09f39841135296770934169225fe72b6
Merge branch 'master' into v4.6.x

Conflicts:
po/da.po
po/uk.po

used version from master
configure.ac