Merged newstairs branch
authorelviz <elviz@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Fri, 15 Oct 2010 20:47:40 +0000 (20:47 +0000)
committerelviz <elviz@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Fri, 15 Oct 2010 20:47:40 +0000 (20:47 +0000)
git-svn-id: https://s.snth.net/svn/neverball/trunk@3314 78b8d119-cf0a-0410-b17c-f493084dd1d7


Trivial merge