[gbrainy: 5/5] Merge branch 'f16'

Mon Nov 14 23:29:52 UTC 2011

commit a8978623ae76a3ab593c73b3417e422bc44425ce
Merge: 26bd518 7bcfd6f
Author: Benoît Marcelin <benoit at marcelin.fr>
Date:   Tue Nov 15 00:27:54 2011 +0100

    Merge branch 'f16'
    
    Conflicts:
    	.gitignore
    	gbrainy.spec
    	sources

 .gitignore   |    4 +---
 gbrainy.spec |    9 +++++----
 sources      |    5 ++---
 3 files changed, 8 insertions(+), 10 deletions(-)
---