Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 9 Aug 2011 03:49:10 +0000 (05:49 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 9 Aug 2011 03:49:10 +0000 (05:49 +0200)
commitc7a2cfc817ff9f8524048bffacacded2a24b970b
tree798ca6d7db982b3f570d869cbf59749dd50037dd
parentb297f5173ba06aef477d8a7bdc7e49cdc4c4f399
parenta4ae66837056553ad2dbdcc14ba165892ce16085
Merge branch 'master' into next

Conflicts:
doc/language_missings
doc/language_issues.de
doc/language_issues.en
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.pl
doc/language_issues.ru
doc/language_missings
make.sh