]> git.donarmstrong.com Git - neurodebian.git/commit
Merge remote branch 'alioth/master' into enh/wheezy-vm
authorYaroslav Halchenko <debian@onerussian.com>
Tue, 18 Dec 2012 17:50:30 +0000 (12:50 -0500)
committerYaroslav Halchenko <debian@onerussian.com>
Tue, 18 Dec 2012 17:50:30 +0000 (12:50 -0500)
commit585d2e26c6346432d4e3714ab678d4d52c777259
treeb6704ac484261b70bc2dfb0499fac6e531417f29
parent2fdac85ca3cd1d0f74035ee6a999bb129ef4e14d
parent62789c76a0d530dc3a41fc87da9758fa179044a7
Merge remote branch 'alioth/master' into enh/wheezy-vm

* alioth/master:
  BF: move -u in nd_build down so we get sensible help
  exclude debian-devel from being wipedout upon upload-website