-
Tim Janik authored
* Fixed wrongly resolved merge conflicts. svn path=/trunk/; revision=20633
de676bf5
Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.
* Fixed wrongly resolved merge conflicts. svn path=/trunk/; revision=20633