Merge branch 'master' of gitorious.org:fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Thu, 16 Jan 2014 20:27:37 +0000 (21:27 +0100)
committerBARANGER Emmanuel <embaranger@free.fr>
Thu, 16 Jan 2014 20:27:37 +0000 (21:27 +0100)
commit7b54cb46ace298f42dae9a0c9a637eae46230722
treeda4c0465705660ee859dafbb15bcdc789f9e509a
parentc7465b7318743a9f2d94a55d4297975d67de7e80
parentecc31dd6d55705a7e3c58821604e371f00c71318
Merge branch 'master' of gitorious.org:fg/fgdata