18.07.2013 16:20
test
g
Merge commit '21950ebc9c583bc4010cadf240b4ce34765c1dfb'

Conflicts:
	ReBook/src/ReBook/urls.py
	ReBook/src/bookshop/templates/base.html
	ReBook/src/userauth/urls.pyc
	ReBook/src/userauth/views.pyc