Merge branch 'master' into cbrutail/translation-hu_0.6
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 23 Feb 2012 21:39:48 +0000 (22:39 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 23 Feb 2012 21:39:48 +0000 (22:39 +0100)
commitb31fdb3f0d23f507bb97e84b7a3171570f58fa61
treed919884e5914e0833c3458b79b6fb16d7037473b
parent51c3ad8f5275e9a0f57fccd021b18dc3ce608ce6
parentabbe17096b47e17f508614fabb18bf2c5fa8fe83
Merge branch 'master' into cbrutail/translation-hu_0.6

Conflicts:
menu.dat.hu.po

merge master, but keep the since modified files in local