Merge branch 'master' of gitorious.org:fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Fri, 28 Feb 2014 00:07:25 +0000 (01:07 +0100)
committerBARANGER Emmanuel <embaranger@free.fr>
Fri, 28 Feb 2014 00:07:25 +0000 (01:07 +0100)
commit612a011c973243d55d580c9c10f168bd4e7be48c
tree2dce280e57886927202cc9077bf205ae329ff1e2
parent96c74390be96000cc9dc3a56a80142d7a001fa4a
parenteaaf816b772649d5b0826a1d0bdd166dbc5b968f
Merge branch 'master' of gitorious.org:fg/fgdata