Merge branch 'master' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Sat, 31 Dec 2011 12:59:10 +0000 (13:59 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Sat, 31 Dec 2011 12:59:10 +0000 (13:59 +0100)

Trivial merge