Public Git Hosting - mygpo.git/commit

Merge branch 'master' into category-db

Conflicts:
couchdb/_design/categories/validate_doc_update.js
couchdb/_design/categories/views/by_tags/map.js
couchdb/_design/categories/views/by_update/map.js
couchdb/categories/_design/categories/validate_doc_update.js
couchdb/categories/_design/categories/views/by_tags/map.js
couchdb/categories/_design/categories/views/by_update/map.js
couchdb/general/_design/categories/validate_doc_update.js
couchdb/general/_design/categories/views/by_tags/map.js
couchdb/general/_design/categories/views/by_update/map.js
couchdb/general/_design/sanitizing_rules/views/by_slug/map.js
couchdb/general/_design/sanitizing_rules/views/by_target/map.js
doc/dev/couchdb-views.rst
mygpo/db/couchdb/__init__.py
mygpo/db/couchdb/management/commands/sync-design-docs.py

commit	54c2976a9fb1501c6a09d0f694a3d359f52acb1d
author	Stefan Kögl <stefan@skoegl.net>
	Mon, 3 Jun 2013 18:55:38 +0000 (3 20:55 +0200)
committer	Stefan Kögl <stefan@skoegl.net>
	Mon, 3 Jun 2013 19:02:54 +0000 (3 21:02 +0200)
tree	c4662bf95a56eff22aab39296100005c82b73e9d	tree \| snapshot (tar.gz zip)
parent	11d7234b9aeb7bda211012414b3e8ba993ce1678	commit \| diff
parent	9c35b1778aca64964ad1f5b1167151f721d40213	commit \| diff

doc/dev/couchdb-views.rst	diff1 \|	diff2 \|	blob \| history
mygpo/db/couchdb/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/settings.py	diff1 \|	diff2 \|	blob \| history