Merge branch 'master' of git://gitorious.org/fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Sun, 11 Dec 2011 14:31:17 +0000 (15:31 +0100)
committerBARANGER Emmanuel <embaranger@free.fr>
Sun, 11 Dec 2011 14:31:17 +0000 (15:31 +0100)
commitcb39d16a1031e8b94a03bd2b55fb3279210e6fce
tree5deea115a7d74fd85c4cdd24ee34f33f96cfb763
parentd428a0d3d3c6c73def2d60a5b4ad8c7da54bed02
parent44a525ccd79524bdae8bbcd943e5160079ea18b3
Merge branch 'master' of git://gitorious.org/fg/fgdata