updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

1
2
3
4
5
6
<?php
$wb['package_title_txt'] = 'Package Title';
$wb['package_key_txt'] = 'Package Key';
$wb['Software Package'] = 'Software Package';
$wb['Modify software package details'] = 'Modify software package details';
?>