Merge remote-tracking branch 'origin/master' into feature/jessie
commit3dee339c8fcc19aad02efa0ad67ed12495f13e78
authorintrigeri <intrigeri@boum.org>
Sat, 14 Mar 2015 15:46:32 +0000 (14 15:46 +0000)
committerintrigeri <intrigeri@boum.org>
Sat, 14 Mar 2015 15:46:32 +0000 (14 15:46 +0000)
treec09d36e1da4a89cdc96b981062d3b3f9429a99a9
parent0a4c5e7abfb0f0ed1cd60c595efba2231351a285
parent0db0b4566659ef1567447b3fc46337263630dfa4
Merge remote-tracking branch 'origin/master' into feature/jessie
lib/Tails/Persistence/Configuration/Button.pm