Merge branch 'master' of gitorious.org:smewt/guessit
authorNicolas Wack <wackou@gmail.com>
Sun, 12 Jun 2011 13:59:11 +0000 (15:59 +0200)
committerNicolas Wack <wackou@gmail.com>
Sun, 12 Jun 2011 13:59:11 +0000 (15:59 +0200)
commit35b4d00c6eabd6c7668b6dbaf880da17f472e062
treeadab5057f552005909ae5e50b18018a67bf62470
parente992d37c59543f68503a4d6ffafd08a5cdf212f9
parent1e0084662d4d546a2b8389228ef7021f662cab7e
Merge branch 'master' of gitorious.org:smewt/guessit

Conflicts:
guessit/matcher.py
guessit/matcher.py
test/guessittest.py