Enhance MANIFEST.in slightly to have a usable packed dev version from github.
Order default search results by title.
Preserve file information and content while editing it.
Merge pull request #240 from j23d/enhance_manifest

Enhance MANIFEST.in slightly to have a usable packed dev version from github.
Merge pull request #241 from j23d/order_search

Order default search results by title.
Merge branch 'master' of github.com:Kotti/Kotti into fix_file_editing
Move pre-fill file data from extra widget to the before hook of the form, refs #242.
Remove trailing whitespace, pep8 happiness.
Remove trailing whitespace, again.
Move file appstruct enhancement from DocumentEditForm to FileEditForm, refs #242.
Changelog.
Merge pull request #242 from j23d/fix_file_editing

Preserve file information and content while editing it.
Add some docstrings.
Merge branch 'master' of github.com:Kotti/Kotti

# By Marco Scheidhuber (8) and others
# Via Daniel Nouri (3) and others
* 'master' of github.com:Kotti/Kotti:
  Changelog.
  Move file appstruct enhancement from DocumentEditForm to FileEditForm, refs #242.
  Remove trailing whitespace, again.
  Remove trailing whitespace, pep8 happiness.
  Move pre-fill file data from extra widget to the before hook of the form, refs #242.
  Preserve file information and content while editing it.
  Order default search results by title.
  Enhance MANIFEST.in slightly to have a usable packed dev version from github.
  Next version
  Release 0.9b1
  Small fix, put the tal:replace in <ul> instead of <li> it seems.
Add some docstrings.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Add some docstrings.

Conflicts:
	kotti/views/util.py
Add some docstrings.
Merge branch 'master' of github.com:disko/Kotti

* 'master' of github.com:disko/Kotti:
  Add some docstrings.
  Add some docstrings.

Conflicts:
	kotti/views/util.py
Add some docstrings.
Merge branch 'master' of github.com:disko/Kotti

* 'master' of github.com:disko/Kotti:
  Add some docstrings.
  Add some docstrings.
  Add some docstrings.

Conflicts:
	kotti/views/util.py