tree d0944241360d0aea7feaa498aed6639b2a1af33f
parent a144966da6e8a473602961a4f485c68b1aec739e
parent 137a95c8cbbd9db910808f6b4d19210f8dfec4bc
author Luca Milanesio <luca.milanesio@gmail.com> 1384884255 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> 1384884255 +0000

Merge commit '137a95c8cbbd9db910808f6b4d19210f8dfec4bc' into stable-2.8