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

[Dominik Mierzejewski]

commit a75f50611b997837d0f2b600f706f2689ff0e40c
Merge: a4b913a c2a5e67
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Mon Aug 23 20:16:00 2010 +0200

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

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