Merge branch '1.3.x-release'
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 23 Feb 2016 21:48:26 +0000 (22:48 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 23 Feb 2016 21:48:26 +0000 (22:48 +0100)
commit9c6b86affb570a2e2d18c6da795c359da393f9a3
tree4c4ac6dab8520f235b11507509fc127965ffe092
parent009c7510df1ac1b70662b0085ebaf1a619dd761a
parent244117563f4c74686ba8f47d1942850e601545f2
Merge branch '1.3.x-release'