From: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed, 29 Feb 2012 03:59:28 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh-cengique/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c7bf43148a38cf1444fe2edf8a1275250a3f5b12;p=neurodebian.git

Merge remote-tracking branch 'gh-cengique/master'

* gh-cengique/master:
  Several fixes in live image page and minor changes in derivatives page
  Addressed Yaroslav's comments on first draft about usb stick degradation, virtual machines, and clarifying the scope of the license.
  draft version of comp neurosci live usb stick blog page w/o download links
---

c7bf43148a38cf1444fe2edf8a1275250a3f5b12