Version 2.6-dev
Merge pull request #343 from pgiraud/2.6-dev

Version 2.6-dev
Merge pull request #342 from dodobas/l10n_update

Update tx master files
example Apache conf snippet for mod_wsgi
additional information on adding users
Merge pull request #353 from oeon/patch-1

example Apache conf snippet for mod_wsgi
Merge pull request #354 from oeon/patch-2

additional information on adding users
Expand the leave a comment placeholder, to encourage more meaningful comments
Spelling.
Merge pull request #365 from CloCkWeRX/leave_comment_placeholder

Expand the leave a comment placeholder, to encourage more meaningful comments
Added local resource for d3js and resolved issue #338
Merge pull request #366 from NitikaAgarwal/master

Use local resource for d3js
Fixes #338.
Added the local resource for typeahead.bundle.js in osmtm/static/js/lib folder and made the required changes in project.edit.mako
Merge pull request #370 from NitikaAgarwal/master

Added the local resource for typeahead.bundle.js library
Update l10n sources
Merge pull request #388 from dodobas/tx_update_17102014

Update l10n sources
Add doc to push new tag to github
Don't import task boundary in JOSM
Propose link to GPX instead. Fixes #251
Merge pull request #390 from pgiraud/josm_ignore_tags

Don't import task boundary in JOSM
Move unlock button to more appropriate location