Merge branch 'master' of dgpo:~martin/mygpo-src
commita093fbab0c3a3405ca5f75ad27b2d0241ca79e1e
authorStefan Koegl <stefan@skoegl.net>
Fri, 20 Nov 2009 18:45:39 +0000 (20 19:45 +0100)
committerStefan Koegl <stefan@skoegl.net>
Fri, 20 Nov 2009 18:45:39 +0000 (20 19:45 +0100)
treeadc6ee49b338a1bfa3f6dec074847869150a98a3
parent431e1e4b691a8fa51e6e40d9fb05881282f1d99a
parent49176e4c4dbf11aaaa4a8dbdd7c60877f5cfbb1c
Merge branch 'master' of dgpo:~martin/mygpo-src

Conflicts:
install/update-03.sql
install/update-03.sql