Merge branch 'master' of git://gitorious.org/fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Sun, 6 May 2012 16:34:31 +0000 (18:34 +0200)
committerBARANGER Emmanuel <embaranger@free.fr>
Sun, 6 May 2012 16:34:31 +0000 (18:34 +0200)
commitb12fc6e5a1dd39b5a7b569be45c0bb3ef894a90c
tree06d6f5b282ff56ab67e2e09baa9f078f49b772a6
parent13ac209724cd391688914286c980dd37d3fb0c42
parente5063d4a3d7f5c6a7ae2d1f6c7509ace12a4a0e3
Merge branch 'master' of git://gitorious.org/fg/fgdata