Merge branch 'master' into rpc

James Moger

2011-10-02 f762b160efd5cafd919a6fd7f9587f578eceb454

 docs/02_federation.mkd

@@ -175,7 +175,7 @@


## Federation Pull Registration Keys



<table class="text">

<table>

<tr><th>federation.N.url</th>

<td>string</td>

<td>the url of the origin Gitblit instance *(required)*</td>