tree 0a5476277e9f4b003b61d3ebda355194c268e3d8
parent 23004af2a0cdc540422eafe871c7f4c8d65cb223
parent da6f59eaf855be1fa2c653068644a0f4ba2e5d33
author Charles M. Hannum <root@ihack.net> 1399659526 +0200
committer Charles M. Hannum <root@ihack.net> 1399659526 +0200

Merge branch 'mycroft'