Merge branch 'ostatus' into develop
authorRoger Braun <roger@rogerbraun.net>
Sun, 23 Apr 2017 08:37:29 +0000 (10:37 +0200)
committerRoger Braun <roger@rogerbraun.net>
Sun, 23 Apr 2017 08:37:29 +0000 (10:37 +0200)
commit4649ba2d627ab1c42e9067d0af783ae05ac8ae11
tree4bc0c9062e597e2d85c005d93ef6dbacf098e84a
parent361a8c42197a92f044fc3d0ceadeee5e3590e96f
parentcef4a4d7095eae474c0bebaa4b0fb0001f140672
Merge branch 'ostatus' into develop