Merge branch 'p/anton.e/master' of git:projects/modsched/freebsd into p/jkrieg/master
authorJens Krieg <jkrieg@mailbox.tu-berlin.de>
Mon, 26 May 2014 11:03:55 +0000 (13:03 +0200)
committerJens Krieg <jkrieg@mailbox.tu-berlin.de>
Mon, 26 May 2014 11:03:55 +0000 (13:03 +0200)

Trivial merge