summaryrefslogtreecommitdiff
path: root/bin
diff options
authorPo-Hsu Lin <po-hsu.lin@canonical.com>2014-06-19 13:15:55 +0000
committerDaniel Manrique <>2014-06-19 13:15:55 +0000
commit2b00537416371a78298684d7638d4155f6d8b19c (patch)
tree0c847aefa2b622395db191d2eec77071fae17f9a /bin
parentc55dfc9e4b36cbae9aece50600bf9903d160473d (diff)
parentace8491c360f3d1004ec87bc0fc2d4fb1fbd4c97 (diff)
"automatic merge by tarmac [r=roadmr][bug=1330399][author=cypressyew]"
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions