Merge branch 'master' into typesafe
authorDennis Schafroth <dennis@indexdata.com>
Tue, 3 Jan 2012 20:51:45 +0000 (21:51 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 3 Jan 2012 20:51:45 +0000 (21:51 +0100)
commit93f586a855c7cfd9b18d1947f47cc7d4d1b1eb68
treea3fa727ca9df54c00ed07bdc22bfe4bcf1f679c8
parentbb12d123c7bf31db6319b7f2e4663b92462c6d21
parent0016f79366a4e689374c2b73453b695e92a8d3b5
Merge branch 'master' into typesafe