Merge branch 'tr-integ' into kevin-chbind
authorSam Hartman <hartmans@debian.org>
Wed, 6 Mar 2013 19:31:03 +0000 (14:31 -0500)
committerSam Hartman <hartmans@debian.org>
Wed, 6 Mar 2013 19:31:03 +0000 (14:31 -0500)
commit2794adea85fafbcb859a63de3ce6ccef8f7f7fb4
treec05009d07dae90258c3187ba7a2843dcf666bff0
parentf7a5f9c1b99f645be8cf1f79bdcdbe3cabb083f9
parent5e161c6cf7189664ec520297aded22e195d93058
Merge branch 'tr-integ' into kevin-chbind

Conflicts:
src/main/realms.c
src/include/realms.h
src/main/realms.c