Merge branch 'master' of git://repo.or.cz/telemaster
commit9acf5d836f0b03bda2ec185ea1d0a33663c82f64
authorDiogo Ferreira <diogo@underdev.org>
Fri, 3 Aug 2007 01:23:50 +0000 (3 02:23 +0100)
committerDiogo Ferreira <diogo@underdev.org>
Fri, 3 Aug 2007 01:23:50 +0000 (3 02:23 +0100)
treeb33ddcc217419ae5433be54464ac21e4c31d550e
parentb11ad30a73f1e077250b9044a2a5d2001f8f59fc
parent9ba1e8e6c6d5316ae102f803433c012520d415f8
Merge branch 'master' of git://repo.or.cz/tele