Merge commit 'refs/merge-requests/74' of git://gitorious.org/fg/fgdata into merge...
authorGijs de Rooy <gijsrooy@hotmail.com>
Thu, 3 Feb 2011 13:51:09 +0000 (14:51 +0100)
committerGijs de Rooy <gijsrooy@hotmail.com>
Thu, 3 Feb 2011 13:51:09 +0000 (14:51 +0100)
commit6c601b75367e3b066e3f14ae4735160450464f1e
tree7160b944d9b253807e14dfd9ce31677d584382eb
parent1fdefa50020fb2ddb0a07bdcc66275e02eea984b
parent0beb66f8abb3fa345565719b0101665e919a3035
Merge commit 'refs/merge-requests/74' of git://gitorious.org/fg/fgdata into merge-requests/74