Merge branch 'master' of git://gitorious.org/fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Fri, 24 Feb 2012 20:56:26 +0000 (21:56 +0100)
committerBARANGER Emmanuel <embaranger@free.fr>
Fri, 24 Feb 2012 20:56:26 +0000 (21:56 +0100)
commitdc148b5fda2f72c2c034151a14c9b38d1fd3f56e
tree287d1c081c4c8a588afe9f527b3911d872c5f8d2
parentb6543632bb104a2158a8ba553fbdab2fc096e457
parent15cd38b23706814f82fb75c50eab4c2a93434433
Merge branch 'master' of git://gitorious.org/fg/fgdata