Merge branch 'trustedforwarder'
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 15 Mar 2012 23:23:41 +0000 (19:23 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 15 Mar 2012 23:23:41 +0000 (19:23 -0400)
commitcbe630199fc14c411716fa06468b3399eda8e870
tree10643933656ceded36868d3bb475c203bacacaff
parent7745eb08f48eaf9acb48652d44944e9425c11f3a
parent6b85debb775a4fb316a3f5e7490a129aaa9e9245
Merge branch 'trustedforwarder'