Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 29 Dec 2011 16:02:49 +0000 (17:02 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 29 Dec 2011 16:02:49 +0000 (17:02 +0100)
commit7cb5e73aed101f67f8471bce850b19dea1c76193
tree564e1874753e133eb567843c3cb43d935c23d518
parent0e37134fba3ad64c154dccc1b1a55a03a52149ec
parent906ae86e66d768601c5280d3d7d939ef46737d92
Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore