Commit Graph

2 Commits

Author SHA1 Message Date
Marek Marczykowski-Górecki
74314ce739 Merge remote-tracking branch 'origin/pr/63' 2015-12-09 20:34:43 +01:00
Brennan Novak
84c1a0c722 fixed merge conflict QubesOS/qubes-issues#1202 2015-12-02 19:14:39 +01:00