Merge branch 'bug-1200' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 25 Aug 2013 18:51:39 +0000 (20:51 +0200)
committerMichael Tänzer <neo@nhng.de>
Sun, 25 Aug 2013 18:51:39 +0000 (20:51 +0200)
commite40fba184192384eb46ba9f9a2fc7f513e339067
treee4ff5d02ee803d6112515ef8d5ff3538a16ab3f4
parent2d6e2851a754bbd8d5f5afb0d02bc5caba7d6626
parentbe962501af189b26322728a8a28efddc9afdd81b
Merge branch 'bug-1200' into release