Merge branch 'merge-requests/2238' into 2.x-stable
authorChristian Johansen <christian@gitorious.com>
Fri, 15 Feb 2013 12:28:59 +0000 (13:28 +0100)
committerChristian Johansen <christian@gitorious.com>
Fri, 15 Feb 2013 12:28:59 +0000 (13:28 +0100)
commit03388c9ae22bcd08c8d987fe317ab3ff9aee2ced
tree4ea77a4493d6991e7d58d1a257e54b01eaeb8fe1
parentc02c86b66b02d5d7c2b57eb814ca87ddcd559f49
parent91377e8105e3ecc4077b47a219d6eb06427e1ec8
Merge branch 'merge-requests/2238' into 2.x-stable