Revision 250c31d5
ID: 250c31d5ff01722e35888c6b92bd0969a6a51aef
fix conflict merging upstream on master
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
Files
- added
- modified
- copied
- renamed
- deleted
ID: 250c31d5ff01722e35888c6b92bd0969a6a51aef
Added by Andreas Unterkircher 1154 days ago
fix conflict merging upstream on master
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>