Merge pull request #3194 from stonier:2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 9 Sep 2014 06:33:15 +0000 (06:33 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 9 Sep 2014 06:33:15 +0000 (06:33 +0000)
commitfaed8f43d6db535580936645de2929ce19de91c3
tree7958fa49d9351994323a50fa58cbb41d45fde2c1
parent9a15c7a899dd4f336cb9834f41ca74c6f672f350
parent161f50962d6105dc665a3035c0d489671f9bb6f0
Merge pull request #3194 from stonier:2.4