Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Dec 2011 22:54:53 +0000 (17:54 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Dec 2011 22:54:53 +0000 (17:54 -0500)
commitf1a6d747754b4dad22e0b90808da99ab876d4e2b
tree213680a40b3bee4b8a5b65e9b2d033a5c9bc02b9
parentb12fc3e11223557855bb2394e1097afbf0de0b79
parent5fe2dbd7b6a182b90128371f8e8d679d70133d6b
Merge branch '0.5.0.x' into 0.5.x