The following commit has been merged in the next branch: commit 1a43e58fbd0a24cb89baabf45fcc325f1d97b77d Merge: 240a99f99a824a324abbeffb2415e72b8467e6f2 a9f63504f17d75914831dc8b6940b2740fa4e655 Author: Sven Eckelmann sven@narfation.org Date: Mon Nov 14 10:15:47 2011 +0100

Merge commit 'v2011.4.0'