Merge branch 'master' into rpc

James Moger

2011-10-02 f762b160efd5cafd919a6fd7f9587f578eceb454

1
2
3
## Gitblit realm file format: username=password,\#permission,repository1,repository2... 
#Fri Jul 22 14:27:08 EDT 2011 
admin=admin,\#admin,\#notfederated