summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2012-11-09 08:09:31 -0800
committerJesse Morgan <jesse@jesterpm.net>2012-11-09 08:09:31 -0800
commitf61a42b26168cc4932b829bf307f92ff6c4dc21c (patch)
tree61b1573dd2f7e3bcc92f77e0bd2f0e264c6f2cb3
parentb5c30a935c06853f27acc760e695108b09659222 (diff)
parent8f94f6ed1ad32eebf6e36553ebc235ef00e2eeeb (diff)
Merge branch 'master' into jesterpm
-rwxr-xr-x[-rw-r--r--]setup.py0
1 files changed, 0 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index 6d72cac..6d72cac 100644..100755
--- a/setup.py
+++ b/setup.py