Merge branch 'master' into stable
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 29 Mar 2016 19:18:42 +0000 (12:18 -0700)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 29 Mar 2016 19:18:42 +0000 (12:18 -0700)
commiteface4ec49eac45734a3c7bf711ae40b517c1957
treedf8e2d025ff427b396a6f5a5138ff976162e2fb4
parent731224abcab9cfbde7ad69849bbbecc843843d90
parentd1ac2d52fd8859c3f32fa38e4836ffe9615e5bba
Merge branch 'master' into stable