From: Michael Hanke <michael.hanke@gmail.com>
Date: Wed, 15 Jun 2011 13:01:33 +0000 (-0400)
Subject: Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian
X-Git-Url: https://git.donarmstrong.com/?p=neurodebian.git;a=commitdiff_plain;h=4210826e495d5e28039db6314aa550b0ededd989

Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian

* 'master' of alioth:/git/pkg-exppsy/neurodebian:
  changes in vm.rst for 6.0.4
  VM BF: deploy 4.x VB -guest-utils and -guest-x11 in the appliance -- aiming at 6.0.4 now
  updated VM page for 6.0.3 virtual appliance
  VM: uff -- nasty workaround to get VB guest additions be built for 686
  VM: changes for 6.0.3
  VM: adjusting path to new location for source lists
  prepare VM images for VB 4.x series using squeeze-backports
  minor in proj_matlab -- moved finished into Done
  some updates into freesurfer project page
---

4210826e495d5e28039db6314aa550b0ededd989