Merge remote branch 'acp.language/master'
authorTim Düsterhus <timwolla@arcor.de>
Tue, 1 Jan 2013 22:55:05 +0000 (23:55 +0100)
committerTim Düsterhus <timwolla@arcor.de>
Tue, 1 Jan 2013 22:55:05 +0000 (23:55 +0100)
commit9265d52d1e4030c3928145017ddbc3e221549f98
treeea8c47764f2dbef4df2fb479f5aadd5b07ec65f9
parent845907323978d1e5a5d499c4ca1224c8e6529af7
parent1ce252889c845a23850570caf092606eee699ba1
Merge remote branch 'acp.language/master'

Conflicts:
.gitignore
.travis.yml
acpMenu.xml
language/de.xml
package.xml
userGroupOption.xml
.gitignore
acpMenu.xml
language/de.xml
package.xml
userGroupOption.xml