Merge headmerge to branch 1.2 1.2
authorAlpar Juttner <alpar@cs.elte.hu>
Sun, 11 Aug 2013 15:30:30 +0200
branch1.2
changeset 128676284e152f69
parent 1278 92d53f86d1a9
parent 1285 6c8e2d8712d8
child 1289 4f55bac7e625
Merge headmerge to branch 1.2