Merge commit 'refs/merge-requests/72' of git://gitorious.org/fg/fgdata into integration
authorGijs de Rooy <gijsrooy@hotmail.com>
Sun, 9 Jan 2011 11:54:08 +0000 (12:54 +0100)
committerGijs de Rooy <gijsrooy@hotmail.com>
Sun, 9 Jan 2011 11:54:08 +0000 (12:54 +0100)
commitc9f441a55ee2f75da5d57644fd58e3f4cf36b2e3
tree69b561dab3fb812ea1d13a466dbbd81b42a294a3
parent1753f4e8c317f90d24d6f111a16c5304abb8c051
parentd5d3e827f9b5369ee85ccfd9ce347dd5ab76a4aa
Merge commit 'refs/merge-requests/72' of git://gitorious.org/fg/fgdata into integration