Merge branch 'feature/better_power_off_button' of ssh://webmasters.boum.org/~/wiki...
authorTails developers <amnesia@boum.org>
Wed, 5 Dec 2012 10:22:59 +0000 (11:22 +0100)
committerTails developers <amnesia@boum.org>
Wed, 5 Dec 2012 10:22:59 +0000 (11:22 +0100)
commit0217cf30ad95efe798529aadcde952b49976c839
tree55d4922c4fcddabb98e32a5754bf42938ca2480d
parent531dbe9229088673a5a77f51065d862be8a7be94
parent801c97996b08f60457d51642bc95cf7fb51653dd
Merge branch 'feature/better_power_off_button' of ssh://webmasters.boum.org/~/wiki into feature/better_power_off_button