Merge remote branch 'martins/nodestatus'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 3 Jan 2012 01:31:37 +0000 (12:31 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 3 Jan 2012 01:31:37 +0000 (12:31 +1100)
commitadcb076612c56f92cfb6f3ba90721981a067a494
treecef7cbd2229820c1cce04ae21aec3806df9c7337
parent00373958a5d5fb8c9b99548d5b9f327e78669162
parent726b598076132a5a73f9259d6b65ee2a4012099f
Merge remote branch 'martins/nodestatus'