Merge commit 'refs/merge-requests/265' of https://gitorious.org/fg/fgdata into merge...
authorTorsten Dreyer <torsten@ŧ3r.de>
Sun, 22 Feb 2015 20:44:41 +0000 (21:44 +0100)
committerTorsten Dreyer <torsten@ŧ3r.de>
Sun, 22 Feb 2015 20:44:41 +0000 (21:44 +0100)
commitc01dbaf2c78c0c303ea055fccd358b508cf1a1cb
tree1503e1740e44f8cab6651bd0ecbbe6a847595461
parent74316c3d20d067bbb354634b607f9bc5d63db291
parent0b8bf9639f593e322666b01200489c74252ac0c4
Merge commit 'refs/merge-requests/265' of https://gitorious.org/fg/fgdata into merge-requests/265