summaryrefslogtreecommitdiff
path: root/bin
diff options
authorPo-Hsu Lin <po-hsu.lin@canonical.com>2014-07-17 14:16:38 +0000
committerDaniel Manrique <>2014-07-17 14:16:38 +0000
commitbdc207ba438e4a16efb2c7168ea69882ea400366 (patch)
tree73deb941a3f69a91c2f6bc8408dc7467030f4929 /bin
parentf5976f7f6bd8a5cded737c0a40bdb56fe2729e69 (diff)
parent6d1f860b92248bc4a9bc1a453c829bdd25a49b00 (diff)
"automatic merge by tarmac [r=roadmr][bug=][author=cypressyew]"
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions