Merge pull request #3018 from fradelg:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 1 Aug 2014 13:06:36 +0000 (13:06 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 1 Aug 2014 13:06:36 +0000 (13:06 +0000)
commitd01ca30f55ab47de0860b1d89c1dc1b27c3dc0d8
treed82ebe93945d658d87378665cb8e44b1807d6cf4
parent345b69d5f7319e639481da5188164dcca1c237e3
parent625fd613130dcd0d49ea6dafd81b741b6c2b6165
Merge pull request #3018 from fradelg:master