Merge commit 'refs/merge-requests/6' of git://gitorious.org/statusnet/gnu-social...
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 4 Jan 2014 20:27:28 +0000 (21:27 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 4 Jan 2014 20:27:28 +0000 (21:27 +0100)
commit4759365293118c39dbb30fedc3070743a0b9a763
tree7952b0c4f8e4bc302493a8284dc625b17c86f195
parent9edde007b15dd1840df03cd3cb4fbf7ff400b3f0
parent95222df899a9ec3be564170ac78833f249306d0c
Merge commit 'refs/merge-requests/6' of git://gitorious.org/statusnet/gnu-social into merge-requests/6