]> git.donarmstrong.com Git - neurodebian.git/commit
Merge remote-tracking branch 'gh-cengique/master'
authorYaroslav Halchenko <debian@onerussian.com>
Wed, 29 Feb 2012 03:59:28 +0000 (22:59 -0500)
committerYaroslav Halchenko <debian@onerussian.com>
Wed, 29 Feb 2012 03:59:28 +0000 (22:59 -0500)
commitc7bf43148a38cf1444fe2edf8a1275250a3f5b12
tree580fc752ed2beafb42255562e9e4f9cd7b3e225d
parent1f7398668509bb49044262e5af776fb2a7895964
parent84fdaecabc5269f12980c8a9a6dd86c3d4f14d60
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
sphinx/derivatives.rst