Merge branch '2.x-stable'
authorChristian Johansen <christian@gitorious.com>
Tue, 12 Mar 2013 09:53:21 +0000 (10:53 +0100)
committerChristian Johansen <christian@gitorious.com>
Tue, 12 Mar 2013 09:53:21 +0000 (10:53 +0100)
commita39f9b35c43315aa8765ff5097b37429e89a52fc
tree4bd4c557684c3aaae72b30a4a7a2d16309a328f8
parent6408eb5129b45cc4342bf0fddc095dc2387170fe
parent941646757d0f9ac7732ee98cf966156f19ced6ef
Merge branch '2.x-stable'