Merge branch 'ff/auth'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 25 Apr 2009 21:58:23 +0000 (23:58 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 25 Apr 2009 21:58:23 +0000 (23:58 +0200)
commit2aaf8463bb35544b9e631c658521994a2c0927d3
treeec2717a83cf51ba02db10e4a3dd7396ba2335be2
parentd1e62aa4497458ed86d20f5ef1b6c00d50596da0
parent1c1ebb06259ee0fd215faf5c0c4d722bb48ea726
Merge branch 'ff/auth'