Merge remote-tracking branch 'origin/master' into nifrek/longjumpanim
authornifrek <nifrek@gmail.com>
Wed, 15 Jun 2011 15:48:47 +0000 (11:48 -0400)
committernifrek <nifrek@gmail.com>
Wed, 15 Jun 2011 15:48:47 +0000 (11:48 -0400)
commit24d3b70710834a69e05bc7df2641be6d1fd48867
tree48fe82206f97907efd7aa48fd35f7f6150999420
parentd20abc72303a0dd4db87a52ad5c3137d2b200ee0
parent6a8fd1220b48e7ce718d4356bedb0bda54b347f6
Merge remote-tracking branch 'origin/master' into nifrek/longjumpanim