Merge branch 'master' of git+ssh://DrFrasierCrane@repo.or.cz/srv/git/straw/fork
commit653e4b2420aeac10ed43ac27e20792b9969177e3
authorDrFrasierCrane <yagood@o2.pl>
Fri, 23 Nov 2007 20:42:30 +0000 (23 21:42 +0100)
committerDrFrasierCrane <yagood@o2.pl>
Fri, 23 Nov 2007 20:42:30 +0000 (23 21:42 +0100)
tree8542c3dc22ba39de692672ac72c99a7b35e53b33
parente7bc5a146b57d8fd35235202077890a1e1886549
parent3f8f242cad28e9df6db06d44ac82c7455d7342f6
Merge branch 'master' of git+ssh://DrFrasierCrane@repo.or.cz/srv/git/straw/fork

Conflicts:

straw/FeedListView.py
straw/FeedListView.py