[mnemosyne: 9/11] Merge remote branch 'origin/f13/master'

[Dominik Mierzejewski]

commit 0b47c65c45104cc0870cb4c6d89703be3e6e7959
Merge: 2d32feb bda4cc3
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Sat Nov 20 23:35:43 2010 +0100

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---