Merge branch 'master' of git://gitorious.org/fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Wed, 1 Aug 2012 13:23:20 +0000 (15:23 +0200)
committerBARANGER Emmanuel <embaranger@free.fr>
Wed, 1 Aug 2012 13:23:20 +0000 (15:23 +0200)
commitf68ebff564e2cda87d5a3fcaad404852aa49a5c0
tree95c120571dc56a79564112f23607ef0565126f02
parent2f1476fad9808b66c0375c8bbd6326629b2d0cb2
parent10e8e906740c8ded3ee0fa235d00e8b48880d040
Merge branch 'master' of git://gitorious.org/fg/fgdata