Merge branch 'master' of /home/alex/mygpo-src
commitfc47227ddf1811ff315f18ecc01606e66979cc97
authorStefan Koegl <stefan@skoegl.net>
Thu, 21 Jan 2010 09:16:21 +0000 (21 10:16 +0100)
committerStefan Koegl <stefan@skoegl.net>
Thu, 21 Jan 2010 09:16:21 +0000 (21 10:16 +0100)
treee2f1f084c9deae5df0da1ab09d8c838d2c3db45c
parent18e16dc3718aa1c19224fa1a5032069d48808522
parent3c139c05b9aa789a68024f8a2a8aaaac0fe1a3fc
Merge branch 'master' of /home/alex/mygpo-src
mygpo/api/simple.py
mygpo/web/views.py