Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 30 Dec 2011 14:33:32 +0000 (15:33 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 30 Dec 2011 14:33:32 +0000 (15:33 +0100)
commit39922611b3dcbd1a6cee3dfa52689d551ca41733
tree690ffbc0a0f674ddcc231061492b5fe5a96b0b61
parentf2938bcde6d2a3576dfff92687d5f9615c421c7d
parent9e1249a93e9229051b71f9b01864f71a71d095b8
Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore