Merge commit 'refs/merge-requests/257' of git://gitorious.org/gitorious/mainline...
authorPawel Pierzchala <pawelpierzchala@gmail.com>
Thu, 23 Jan 2014 15:52:27 +0000 (16:52 +0100)
committerPawel Pierzchala <pawelpierzchala@gmail.com>
Thu, 23 Jan 2014 15:52:27 +0000 (16:52 +0100)
commitde80c587d9051276a426667867e22ba428683e25
tree3e959523c7ef98c57ba800169267556eb7cbb56c
parent8d38493e227efe35d49ca9c32cf2fea5d6cf0b0b
parent626a5408370802c44004a762d26e644cd6bb826d
Merge commit 'refs/merge-requests/257' of git://gitorious.org/gitorious/mainline into merge-requests/257