Sun, 11 Aug 2013 15:29:28 +0200Merge >=1.2 branch heads
Alpar Juttner <alpar@cs.elte.hu> [Sun, 11 Aug 2013 15:29:28 +0200] rev 1285
Merge >=1.2 branch heads

Sun, 11 Aug 2013 15:28:12 +0200Merge >=1.2 branch heads
Alpar Juttner <alpar@cs.elte.hu> [Sun, 11 Aug 2013 15:28:12 +0200] rev 1284
Merge >=1.2 branch heads