Merge remote-tracking branch 'upstream/master'
authorCallum <callum@callum-ubuntu.(none)>
Fri, 13 Sep 2013 04:37:04 +0000 (12:37 +0800)
committerCallum <callum@callum-ubuntu.(none)>
Fri, 13 Sep 2013 04:37:04 +0000 (12:37 +0800)
commit5ab6641e1e2c28d85440f4cbe4c4091d0c54d1ab
treebf5029e07633ebb91f01c13c3ea50d81d2f40632
parent28f3b3b6ecd1a7ab6686b15c5c885e57cb5fce43
parentd0f77e15cfa58191a7683caf343037c25be9f31c
Merge remote-tracking branch 'upstream/master'

Conflicts:
server/sensor.c
server/sensor.h
server/sensor.c
server/sensor.h

UCC git Repository :: git.ucc.asn.au