Merge branch 'master' of gitorious.org:fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Tue, 18 Dec 2012 22:49:47 +0000 (23:49 +0100)
committerBARANGER Emmanuel <embaranger@free.fr>
Tue, 18 Dec 2012 22:49:47 +0000 (23:49 +0100)
commita67d223216bbe70ddf1f1a3af0400f9c2e55f6b2
tree7b6d4ed0e9b9ec67d272a067b8ec714071918580
parent3c6e9282545f9dc15981bfe2764e28e720691f69
parenta316461e7c918bf7fc23a717e3b87a058864e885
Merge branch 'master' of gitorious.org:fg/fgdata