Merge commit 'refs/merge-requests/271' of https://gitorious.org/fg/fgdata into merge...
authorTorsten Dreyer <torsten@ŧ3r.de>
Sun, 22 Feb 2015 20:42:46 +0000 (21:42 +0100)
committerTorsten Dreyer <torsten@ŧ3r.de>
Sun, 22 Feb 2015 20:42:46 +0000 (21:42 +0100)
commit74316c3d20d067bbb354634b607f9bc5d63db291
tree7b63645badda10df674fb832d3d9144047cfd192
parenta9f60e47568fd61984d5b0acae700a10d603a996
parent99bba43c86212b3737a4ae663a1da056bfd90a3b
Merge commit 'refs/merge-requests/271' of https://gitorious.org/fg/fgdata into merge-requests/271