Merge branch 'display-tracked-branch'
commit59470c3f240379e57943848d01335d2715362824
authorSven Strickroth <email@cs-ware.de>
Sun, 13 Apr 2014 16:01:13 +0000 (13 18:01 +0200)
committerSven Strickroth <email@cs-ware.de>
Sun, 13 Apr 2014 16:01:13 +0000 (13 18:01 +0200)
treede4eb946b67e260d16903251a695c5f7201a9cd0
parentc1fc4cc37e74f37b582eeb2185bd85f52e21c20e
parent3b4a373cb9a4acabf32887988fb0bd9cfe039e55
Merge branch 'display-tracked-branch'