Merge branch 'maint' * maint: subdir-objects: complain if it isn't enabled plans: update w.r.t. latest changes
2013-01-16T13:20:12