]> git.donarmstrong.com Git - neurodebian.git/commit
projects / neurodebian.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b5a4a85 b27e5de)
Merge branch '3rd-party-pristine'
authorMichael Hanke <michael.hanke@gmail.com>
Mon, 26 Sep 2011 10:49:56 +0000 (12:49 +0200)
committerMichael Hanke <michael.hanke@gmail.com>
Mon, 26 Sep 2011 10:49:56 +0000 (12:49 +0200)
commit73ad1fff3e6549776cd41142a33b325f5c602d84
tree205e3b5820d6e0ac9837891a7656aac68f10f7b6tree | snapshot
parentb5a4a85c23cee13e6ea2370621337b990390293dcommit | diff
parentb27e5dec912d269e3479f751228f5f3ba607411acommit | diff
Merge branch '3rd-party-pristine'

* 3rd-party-pristine:
  Update the feed extension from sphinxext repo.

Conflicts:
sphinx/sphinxext/feed/__init__.py
sphinx/sphinxext/feed/__init__.py diff1 | diff2 | blob | history
This is a branch of the neurodebian git repository; upstream is here: git://anonscm.debian.org/pkg-exppsy/neurodebian.git