Merge branch 'v0.13.x'

tilgovi · tilgovi · commit d44c7c028bff · 2014-12-03T13:47:22.000-08:00
Conflicts:
	CHANGES.rst
	setup.py
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,12 @@
 Next release
 ============
 
+0.13.2
+======
+
+- Avoid a confusing error about reindexing when annotator is used as a
+  library and not a standalone application (#107).
+
 0.13.1
 ======
 
