[crm114: 17/20] Merge remote branch 'origin/f13/master'

[Dominik Mierzejewski]

commit ef919151d46897b44ce32d7c0ab561e7b484b4c2
Merge: 9f1e218 1337084
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Sun Nov 21 18:03:13 2010 +0100

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	crm114-rpm.patch
    	crm114.spec

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