Merge branch '1.8'
authorOlivier Goffart <ogoffart@woboq.com>
Thu, 16 Apr 2015 10:49:31 +0000 (12:49 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Thu, 16 Apr 2015 10:49:31 +0000 (12:49 +0200)
commit5dffd11755e24338c8f62ae3a70ef05bed287f99
treee87477584954b0a82bfbf4fa5e5612f68421e3b8
parentf3cb5f8a9d446fe5ee1c63e74c52787a342f5b8f
parent8bb4af067a1fbb5173324137d23bd4323d5d4b4f
Merge branch '1.8'