Merge pull request #4716 from Memphiz/backportsnotspiff
authorjmarshallnz <jcmarsha@gmail.com>
Sat, 7 Jun 2014 05:19:22 +0000 (17:19 +1200)
committerjmarshallnz <jcmarsha@gmail.com>
Sat, 7 Jun 2014 05:19:22 +0000 (17:19 +1200)
commit4f84477f0e82324bf78ae6389ca31a8ba333255b
treece07499f02371d2d89fb45b0c3985aed6061d532
parent56de91168961ed6145fc71cd2b7c94221ff30676
parentd49e59249c5d2f36d2de37bb75cd4f76ed3561ce
Merge pull request #4716 from Memphiz/backportsnotspiff

Backports from nospiffs fork