Merge branch 'master' into 3.0 (one-off)

Browse Source

This is a one-off merge in the direction master->3.0,
to ensure all bugfixes since we branched off find
their way into the next micro/minor release.
From now on, we'll commit to the latest release branch,
and merge back to master. API changes should go into
the master branch (not merged into a release branch).

...

This commit is contained in:

Ingo Schommer 2012-07-05 18:01:47 +02:00

parent 2ac206c3e4 3e24385e31

commit e96de6cc7e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available