Merge branch 'master' of gitorious.org:smewt/guessit
authorNicolas Wack <wackou@gmail.com>
Thu, 24 Mar 2011 04:37:06 +0000 (05:37 +0100)
committerNicolas Wack <wackou@gmail.com>
Thu, 24 Mar 2011 04:37:06 +0000 (05:37 +0100)
commita07bc4656e2685e4917696ba42378e4a30df0029
tree011dbf3b19797ad95c038c6832c13012ccdfa62c
parent37815b13b15b38ac205f74ac8918515242e7069d
parent0297ea7d3e11c9ac1bef968ffa3453270038cab1
Merge branch 'master' of gitorious.org:smewt/guessit

Conflicts:
guessit/video.py
guessit/video.py