Merge remote-tracking branch 'upstream/develop' into 1501-poci-with-location
authorMichael Vogel <icarus@dabo.de>
Sat, 10 Jan 2015 23:51:14 +0000 (00:51 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 10 Jan 2015 23:51:14 +0000 (00:51 +0100)
commitf6ee51bcd7727202205b2e41cd7faef30803fd85
tree48f219f921fc9ef84635537caac9d5d2ac42e38d
parent94fb0305f71e0a7d103183d5fc6e76cfe43fa5ea
parent418ac91c313f982fd56e685f8e1cce8625961c79
Merge remote-tracking branch 'upstream/develop' into 1501-poci-with-location