merging development branch into master

[Shaun Reich]

>* I guess once the branch is merged it should be closed for business:
fixes go >into master and new features go into new branch, right?

yup, well. assuming that we are at/past the feature freeze at that point.

thing is...was this added to the feature page? (if not it cannot be merged
this cycle)

http://techbase.kde.org/Schedules/KDE4/4.10_Release_Schedule#Thursday.2C_October_25.2C_2012:_KDE_SC_4.10_Soft_Feature_Freeze


additionally, shouldn't we do this on reviewboard so everyone can check it
out? i realize it's a bit a pain with big old branches, but would be the
best.

-- 
Shaun Reich,
KDE Software Developer (kde.org)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20121104/92bac432/attachment.htm>