Merge branch 'master' of dgpo:~alex/mygpo-src
commit789ceba3eb7264ae64eb99fad03d02a8a10b58a1
authorStefan Koegl <stefan@skoegl.net>
Sat, 30 Jan 2010 16:13:16 +0000 (30 17:13 +0100)
committerStefan Koegl <stefan@skoegl.net>
Sat, 30 Jan 2010 16:13:16 +0000 (30 17:13 +0100)
tree6b34d2e5efc5d80c6a2b9a17374649b020f05862
parent5393aa40b2081e3a96bc3601b92ec16fd46ab0ef
parent96f8d22d4a661e124de97548266f6e45af258d7d
Merge branch 'master' of dgpo:~alex/mygpo-src
htdocs/media/screen.css
mygpo/api/models.py
mygpo/urls.py
mygpo/web/views.py