commit 3d9ee5edf6f4a6100b8faa2a3e0c7dc32ba91ea9 Merge: 030ecb4 4864af6 Author: Stefano Lattarini <stefano.lattar...@gmail.com> AuthorDate: Wed Jan 16 13:20:12 2013 +0100 Commit: Stefano Lattarini <stefano.lattar...@gmail.com> CommitDate: Wed Jan 16 13:20:12 2013 +0100
Merge branch 'maint'
* maint:
subdir-objects: complain if it isn't enabled
plans: update w.r.t. latest changes
