Merge branch 'master' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 30 Dec 2011 19:57:24 +0000 (20:57 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 30 Dec 2011 19:57:24 +0000 (20:57 +0100)

Trivial merge