Merge branch 'rel-nano-15.05' of ssh://git.openpilot.org/temp into rel-nano-15.05
commit564c69ad6901d88bcd3590e6dfce1ea6bbb19fbc
authorAlessio Morale <alessiomorale@gmail.com>
Mon, 1 Jun 2015 16:23:19 +0000 (1 18:23 +0200)
committerAlessio Morale <alessiomorale@gmail.com>
Mon, 1 Jun 2015 16:23:19 +0000 (1 18:23 +0200)
tree0c1cbc38bd666c53fa70fd48f0067d85cf92e9dc
parent79b9caaf6ed4577cb175dbfc897896f6cf53585d
parent89a140a7e62d97e2ac5b433c031e0f01a23ee040
Merge branch 'rel-nano-15.05' of ssh://git.openpilot.org/temp into rel-nano-15.05