Viewing all changes in revision 4293.

Committer: Sylvain Pineau
Author(s): Jeff Lane
Date: 2016-04-05 00:02:02 UTC
mfrom: <a title="Merged From 4290.1.2" href="/~cypressyew/checkbox/fix-pygiwarning-camera-test/revision/4290.1.2">(4290.1.2 1564595-cpuinfo_parser-s390x)
Revision ID: sylvain_pineau-20160405000202-3h1tamamn0ea85k4

"automatic merge of lp:~bladernr/checkbox/1564595-cpuinfo_parser-s390x/ by tarmac [r=pwlars][bug=1564595][author=bladernr]"

added added

removed removed