Merge branch 'next'
authorChristopher Peplin <chris.peplin@rhubarbtech.com>
Sat, 15 Nov 2014 17:01:01 +0000 (12:01 -0500)
committerChristopher Peplin <chris.peplin@rhubarbtech.com>
Sat, 15 Nov 2014 17:01:01 +0000 (12:01 -0500)
commit411ee67efc933c9fc013849c7d2af03a56fd78f6
tree099d95c5c546db57e75ddda1ea3b2ec37bc58f8b
parent0f55966a881c610e17b360c74273d8a933362212
parent75bc6db24e48f4b577f68a4e27cace82ff8e442c
Merge branch 'next'
openxc.proto