Merge branch 'master' of https://github.com/dpetzold/disqus-python · disqus/disqus-python@73617d8 · GitHub

Commit

Merge branch 'master' of https://github.com/dpetzold/disqus-python

Browse files

Conflicts:
	disqusapi/tests.py

Loading branch information

Derrick Petzold committed Aug 29, 2014

2 parents 870fd34 + 5bf0a60 commit 73617d8