Merge commit 'refs/merge-requests/255' of git://gitorious.org/gitorious/mainline...
authorPawel Pierzchala <pawelpierzchala@gmail.com>
Thu, 9 Jan 2014 14:32:55 +0000 (15:32 +0100)
committerPawel Pierzchala <pawelpierzchala@gmail.com>
Thu, 9 Jan 2014 14:32:55 +0000 (15:32 +0100)
commit019c2621837fca4e92a445008c5734d90448b4b0
tree0b7884f0c1451bdb1f364f931b085cb8c5176c9d
parentf12d2790a77adf890646ab4affd57c7edb2dd509
parentabab4f2cda387b6924ea91951f7aae7419e5601b
Merge commit 'refs/merge-requests/255' of git://gitorious.org/gitorious/mainline into merge-requests/255