Merge branch 'master' into newdesign

* master:
  updated VM page for 6.0.6 (with the date when VM was wrapped on 1st of Oct)
  add remake to give it a page

Conflicts:
	sphinx/vm.rst

diff --git a/neurodebian.cfg b/neurodebian.cfg
index 935d1c99a6a08fa92045d0bf2540f1b289e8a967..ad6c5e63a32e573713c7007f1678833fc4dc8e5e 100644 (file)
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -23,7 +23,7 @@ select names = libnifti2 odin mitools afni-atlases python-pyssdh python-networkx
  python-sklearn python-scikits-learn python-mdp python-mlpy python-openpyxl libgdf-dev matlab-support
  svgtune rorden-mri-tutorial caret-data python-joblib python-sphinx fail2ban
  python-pandas python-skimage neurodebian numdiff nuitka pytables
- guacamole freeipmi
+ guacamole freeipmi remake
 
 # Information about prospective packages to be imported from taskfiles
 prospective =

diff --git a/sphinx/vm.rst b/sphinx/vm.rst
index f8caf10bf3d9dae2356fa9376fb44b4246c8fd86..7a34c0e197a99738102e140f6976bd3735637890 100644 (file)
--- a/sphinx/vm.rst
+++ b/sphinx/vm.rst
@@ -215,6 +215,10 @@ What has changed
 
   <div class="expandinstructions">Click on an item to expand it</div>
 
+6.0.6 -- 01 Oct 2012
+
+  * Updated core system to Debian squeeze 6.0.6
+
 6.0.5 -- 10 Nov 2011
   * Updated core system to Debian squeeze 6.0.3
   * Updated shipped virtualbox-ose guest-utils and guest-x11 to 4.0.10