4 commits

Author	SHA1	Message	Date
md_5	1b854cbe28	Upstream merge + remove 3 pulled patches.	2013-09-12 10:20:02 +10:00
md_5	89720fa208	Upstream merge.	2013-09-08 08:42:56 +10:00
md_5	e36ba8dd96	Upstream merge	2013-08-07 17:16:57 +10:00
md_5	5eb704605d	Add Player Collision API. Thanks to @lazertester and @mrapple for the implementation.	2013-08-03 19:27:26 +10:00