Merge remote-tracking branch 'origin/master' into rewrite-filter
authorHeikki Levanto <heikki@indexdata.dk>
Wed, 12 Jun 2013 13:31:08 +0000 (15:31 +0200)
committerHeikki Levanto <heikki@indexdata.dk>
Wed, 12 Jun 2013 13:31:08 +0000 (15:31 +0200)
commita370d3def5758d5f2d1d7113a27871655fc7cec5
treee8d5e0e9334a104bfe8040a97937a5ad1d3cdd8e
parentdf9b11da1202e8af0eb10633a44405e45c94800e
parentfc12f2596c5150ee78d41d379430476208ea0548
Merge remote-tracking branch 'origin/master' into rewrite-filter
src/Makefile.am
src/factory_static.cpp