tree c92ad8de0660af03c122fb569dcece6476610300
parent 524ee5fbcfeb34c6d18a81ae04bcf346b161c122
parent 50e8e1c07aed5c1105fcf81d7c6a170ea910fc17
author Charles M. Hannum <root@ihack.net> 1399659287 +0200
committer Charles M. Hannum <root@ihack.net> 1399659287 +0200

Merge branch 'mycroft'