0.6-testing merge to master

[netrick]

When will 0.6-testing be merged to master? I think having two development branches is a little confusing.

[texus]

It was merged into master a little more than one week ago, I just forgot to delete the branch.

I can't do that now, but I'll remove the branch in the next few days to make sure there is no more confusion.