[Lemon-commits] Alpar Juttner: Merge headmerge to branch 1.2

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/76284e152f69
changeset: 1286:76284e152f69
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Sun Aug 11 15:30:30 2013 +0200
description:
	Merge headmerge to branch 1.2