From: Yaroslav Halchenko <debian@onerussian.com>
Date: Sat, 27 Nov 2010 02:16:45 +0000 (-0500)
Subject: Merge remote branch 'vm/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6141e4a31b1b18f01abb93feb2f7433424e59220;hp=-c;p=neurodebian.git

Merge remote branch 'vm/master'

* vm/master:
  preseeding: adding partman/confirm_nooverwrite boolean true to prevent yet another question
  NF: fully (nearly) automated construction of VM image
  moving vm tools under vm/tools, deprecating nd_setupguestos replaced with vm/d-i/tools/initial_setup
  adding svgtune -- I doubt it would make to any task... although may be typesetting?
  Help with a smooth installation of Matlab
  Finally push it out to let people use the keyring package.
  Forgot *
  Put booth report link into publication section.
  Advertise donations.
  Minor
  minor touches on the SfN10 coverage
  SfN2010 booth report
  added nspike possible future blend
  Cleanup.
  blends-inject 0.0.5 release: NF: -a mode + BF: addressing Andreas comment on casing
  Rename spm8 doc addenum to match package name.
  Tweak NITRC setup for SPM8.
  Add spm8 (and reorder items).
---

6141e4a31b1b18f01abb93feb2f7433424e59220