Merge branch '3605-node-info-field' refs #3605
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 18 Sep 2014 17:33:03 +0000 (13:33 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 18 Sep 2014 17:33:03 +0000 (13:33 -0400)
commit274ca7a6c2f1f600de4242eee6cb4e8465d4440c
tree203278e839bead5e0cb442ccb2ed2476e0cb37a0
parent4c80f6b8856accfe6017bab4f66d018353986dbc
parent26f139f761174328ea43114a3ef9cb9ad873149a
Merge branch '3605-node-info-field' refs #3605

Conflicts:
services/api/db/structure.sql
services/api/db/structure.sql