tree 5f53f7e9dd60164c53de2069c58f6ee8c43a10af
parent b85d044f83bb4f811232d97db4bb7626222cac83
parent bc6783282a198ea417e84c1bbc882aa41dd3ffae
author EmergentOrder <lecaran@gmail.com> 1446570258 -0400
committer EmergentOrder <lecaran@gmail.com> 1446570258 -0400

Merge PR #11, prep 0.9.6 . Clobbered the PR's predictionio/__init__.py conflicting changes, fixed the rest