[xmp: 8/9] Merge remote branch 'origin/f13/master'

[Dominik Mierzejewski]

commit 1e747f17325a0a8c906f88c8a523fec57bc80689
Merge: 727456e f09daad
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Sat Dec 4 18:30:20 2010 +0100

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

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