commit 3737f849d7c507bd251e7b93eb50fa278b95e788 Merge: f6c950e 888a137 Author: Hans Ulrich Niedermann <hun at n-dimensional.de> Date: Mon Dec 13 14:05:47 2010 +0100 Pseudo-merge branch 'f14' There are no actual differences between master and f14, so we can just merge them and have a single git branch to track. ---