Merge branch 'master' of gitorious.org:fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Sat, 26 Oct 2013 16:32:06 +0000 (18:32 +0200)
committerBARANGER Emmanuel <embaranger@free.fr>
Sat, 26 Oct 2013 16:32:06 +0000 (18:32 +0200)
commit052b7528d1f2e9529ea6fcafcb6d79fc148ea27f
tree370c984af4e346bd51b3b66b28ea92d8e7213a10
parentd8aca57d3db7291b80261ebff42fcb1890e2e81a
parent62645a8120d4e39da0b353a488b9cc1fd03402ba
Merge branch 'master' of gitorious.org:fg/fgdata