Merge commit 'refs/merge-requests/11' of git://gitorious.org/gamergate/gamergate...
commitf6faf94ab80991d2097c740b18ed34f9b2c65d78
authorf57fea14 <f57fea14@tfwno.gf>
Wed, 8 Oct 2014 23:26:01 +0000 (9 00:26 +0100)
committerf57fea14 <f57fea14@tfwno.gf>
Wed, 8 Oct 2014 23:26:01 +0000 (9 00:26 +0100)
tree54c177009621a2758dfe8ce7ff81856831bd6cf1
parentc1c1dfc7e8fe4cec27f6893379d00f436454a581
parentd8c91298d1a37b549c748b5754d8ff06bb5e6efb
Merge commit 'refs/merge-requests/11' of git://gitorious.org/gamergate/gamergate into merge-requests/11