]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fdac85 62789c7)
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)
* alioth/master:
  BF: move -u in nd_build down so we get sensible help
  exclude debian-devel from being wipedout upon upload-website


Trivial merge
This is a branch of the neurodebian git repository; upstream is here: git://anonscm.debian.org/pkg-exppsy/neurodebian.git