* django_pbkdf2:
  add support for new Django hashing methods
  Revert "make reuse of mediamanager popup easier"
  make reuse of mediamanager popup easier
  removed isset() from blank() function
  deny access to .git directories in .htaccess
  use proper JSON in mediaupload response. fixes #1474
  refactor page saving and introduce COMMON_WIKIPAGE_SAVE
  added test for saveWikiTest()
  translation update
  translation update
  translation update
  do not accept empty or root $base in search. fixes #1452
  Adapt .htaccess files for Apache 2.4
  * Created two new options to enable or disable the editing of the display name or the email address in Active Directory. This will allow for the admin to turn the edit feature off if it is not desired that the user could edit their attributes or to prevent errors in case AD does not permit the user to update these attributes.
  Undefined offset, initialize as null
  Fixed undefined offset on $last_ope

New Python Django application default to PBKDF2 with SHA256 as a
password mechanism. This adds support for that mechanism in our
password hasher class. This will be needed in the tests for the new
PDO auth plugin.

refactor page saving and introduce COMMON_WIKIPAGE_SAVE

this was an accidental commit to master

This reverts commit f7f7fb6c.

This introduces a mechanism to override what happens when a media item
is selected in the media manager popup by providing a callback name in
the URL. The default implementation just does what
dw_mediamanager.insert did before and calls insertTags()

As discussed in #1471, an uninitialized variable will always be
implicitly created when passed to the blank() function. Calling isset()
is thus a no-op. A warning about this behavior has been added to the
function comment.

Adapt .htaccess files for Apache 2.4

This makes the saveWikiText() function a little easier to read and moves
external edit handling to its own function. Behavior stays the same
(tests are unchanged).

In addition a new event COMMON_WIKIPAGE_SAVE is introduced that makes
intercepting and acting on page saves much easier than possible before.

Developers can:

* prevent saves by either preventing the default action or overwriting
  the contentChanged field in a BEFORE hook
* enforce saves even when no content changed by overwriting the
  contentChanged field in a BEFORE hook
* Adjust the saved content by modifying the newContent field in a BEFORE
  hook
* Adjust the stored change log information (summary, type, extras) in an
  AFTER hook
* Easily know if a page was deleted, created or edited by inspecting the
  changeType field
* what ever they want before or after a wiki page is saved

for possible upcoming refactoring

Translation update (fa)

now all capabilities are covered

this makes sure manually assigned groups win on systems where only one
group is supported.

otherwise limit and offsets break in mysql

this configures a minimal wordpress setup

Translation update (es)

Disable/enable user editing of AD display name or email address

Translation update (fa)

do not accept empty or root $base in search. fixes #1452