Merge commit 'refs/merge-requests/268' of https://gitorious.org/fg/fgdata into merge...
authorTorsten Dreyer <torsten@ŧ3r.de>
Sun, 22 Feb 2015 20:49:12 +0000 (21:49 +0100)
committerTorsten Dreyer <torsten@ŧ3r.de>
Sun, 22 Feb 2015 20:49:12 +0000 (21:49 +0100)
commit6b72e57625191ed376a5852693aa62dddee4ef65
tree458bf2ae611b4a98698718d27f920eec0561537f
parentc01dbaf2c78c0c303ea055fccd358b508cf1a1cb
parent64dc9d56c46aad7c98bf278d9b12145ab1d33ffe
Merge commit 'refs/merge-requests/268' of https://gitorious.org/fg/fgdata into merge-requests/268