Merge origin/master
authorFulup Ar Foll <fulup@iot.bzh>
Tue, 22 Dec 2015 23:56:14 +0000 (00:56 +0100)
committerFulup Ar Foll <fulup@iot.bzh>
Tue, 22 Dec 2015 23:56:14 +0000 (00:56 +0100)
commit5d293eac235f2d59eccc9b23de803821b821c12e
tree53313c86c0899ab7a428cee4985800c628a242b5
parentcf2b7c5be026071b696c62a8b0f260e624c9a357
parent84e91aa612523ebedcd1d58d2f2f9c30be4d405b
Merge origin/master