Merge branch 'master' of git://gitorious.org/fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Tue, 17 Jan 2012 14:49:52 +0000 (15:49 +0100)
committerBARANGER Emmanuel <embaranger@free.fr>
Tue, 17 Jan 2012 14:49:52 +0000 (15:49 +0100)
commitc1cbb0b5cac59cd86ba2dd9e02c712060b794a84
treeb1d7f2379fe1a1cb3990d50cfde4789f6f0ae6eb
parentda0f96f0c70bb399fe7cbe619c51440307538c08
parent49283115c5042d42c68939b2942eeda7760df5fc
Merge branch 'master' of git://gitorious.org/fg/fgdata