Merge remote-tracking branch 'erik/sendEmail' into core67-merge
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:42:22 +0000 (13:42 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:42:22 +0000 (13:42 +0100)
commit2795e579303e847e245204fe48141444a66a9235
tree040868ce112644ad3ae70da726df3b576093af1d
parent75559f73dc12ccb4d922fb0a8028341bf02bd4f3
parentf98766eb9eac8dee2cfcbdabb78755e08ec39418
Merge remote-tracking branch 'erik/sendEmail' into core67-merge

Conflicts:
make.sh
make.sh