Merge branch 'master' into v4.6.x
authorArun Persaud <arun@nubati.net>
Sun, 18 Dec 2011 18:58:49 +0000 (10:58 -0800)
committerArun Persaud <arun@nubati.net>
Sun, 18 Dec 2011 18:58:49 +0000 (10:58 -0800)
commitc43235f12d0731c9f81f0693fe02f0162edc29a1
treeac03b7ee65f7e8e0e3db56938c665ff5cb23603f
parentf5a68b1722d6f94be27df96d55d63a68ccb2f00a
parent4418fd03bf26086c8c7bd9bd14d3c4ee06bf9373
Merge branch 'master' into v4.6.x

Conflicts:
po/uk.po -- used latest version to resolve merge conflict