[freefem++: 11/12] Merge remote branch 'origin/f12/master'

[Dominik Mierzejewski]

commit a4b913abbcab38e509250f3f34ca771f7c68e12b
Merge: a5399dc 4dbce7a
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Mon Aug 23 20:15:38 2010 +0200

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

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