Merge branch 'release/1.2.7'

fix/24-output-to-filename
Isis Lovecruft 2014-08-01 23:54:09 +00:00
commit 2b47ac2508
No known key found for this signature in database
GPG Key ID: 5C17776E27F7E84D
3 changed files with 7 additions and 5 deletions

4
MANIFEST.in 100644
View File

@ -0,0 +1,4 @@
include LICENSE
include requirements.txt
graft docs

View File

@ -1,3 +1,3 @@
# sha256: UI5KRMglOjhqD4bZyb1KG0y7L5TojUmhnBUTZTymbEU
psutil==1.2.1
psutil>=1.2.1

View File

@ -125,10 +125,8 @@ greater.
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.0",
"Programming Language :: Python :: 3.1",
"Programming Language :: Python :: 3.2",
"Topic :: Software Development :: Libraries :: Python Modules",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Topic :: Security :: Cryptography",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Utilities",]