Merge remote-tracking branch 'alioth/master'

* alioth/master:
  Add talk.
  Tiny wording change.
  Update blends files.
  Typo.

diff --git a/sphinx/pics/vm_host_folder.jpg b/sphinx/pics/vm_host_folder.jpg
index dc408c5b7d0706db8f0235c433adb7c45f711428..d98966585129c998e0fdec5ffc95a19a549a1a17 100644 (file)
Binary files a/sphinx/pics/vm_host_folder.jpg and b/sphinx/pics/vm_host_folder.jpg differ

diff --git a/sphinx/testimonials.rst b/sphinx/testimonials.rst
index 7e6f9383a713fae741ced0e17550a0ed93ce5dd4..4c8c7cc9bd76306fe72316a72a2a44420a4dafa2 100644 (file)
--- a/sphinx/testimonials.rst
+++ b/sphinx/testimonials.rst
@@ -52,3 +52,15 @@ Individual Laboratories and Researchers
 
    [...] those wonderful tools in Debian Neuro [...] make my life as a
    researcher who also maintains a bunch of Debian boxes so much easier.
+
+.. quote::
+   :author: Dr. Jo Etzel
+   :affiliation: Department of Psychology, Washington University
+   :date: 2012-03-15
+   :tags: vm
+
+   I am a dedicated R user ... and have a Windows box. But this
+   afternoon I (finally) downloaded and installed NeuroDebian and the
+   VirtualBox, ran AFNI, and generated the files I needed, all within
+   about an hour and a half. [...] not bad, considering that I know
+   essentially no Linux/Unix. So here's a big "thanks!" :)