commit 9a48695b85f139ddd6f4917dbc7dac17eb0d75f4 Merge: 0cfff8d d34466c Author: Dominik Mierzejewski <dominik at greysector.net> Date: Mon Apr 11 00:39:16 2011 +0200 Merge remote branch 'origin/f13/master' ---